5 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index ef1df93..20307d3 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -564,7 +564,7 @@ void TabRendererGtk::AnimationEnded(const Animation* animation) {
 void TabRendererGtk::StartCrashAnimation() {
   if (!crash_animation_.get())
     crash_animation_.reset(new FavIconCrashAnimation(this));
-  crash_animation_->Reset();
+  crash_animation_->Stop();
   crash_animation_->Start();
 }
 
diff --git a/chrome/browser/views/fullscreen_exit_bubble.h b/chrome/browser/views/fullscreen_exit_bubble.h
index 3767518..c9db5bb 100644
--- a/chrome/browser/views/fullscreen_exit_bubble.h
+++ b/chrome/browser/views/fullscreen_exit_bubble.h
@@ -7,6 +7,7 @@
 
 #include "app/slide_animation.h"
 #include "base/scoped_ptr.h"
+#include "base/timer.h"
 #include "chrome/browser/command_updater.h"
 #include "views/controls/link.h"
 
diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
index 5c0f5f6..56cf48f 100644
--- a/chrome/browser/views/infobars/infobars.h
+++ b/chrome/browser/views/infobars/infobars.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_
 
 #include "app/animation.h"
+#include "base/task.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "views/controls/button/button.h"
 #include "views/controls/link.h"
diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc
index c11fead..9c45dd2 100644
--- a/chrome/browser/views/tabs/side_tab.cc
+++ b/chrome/browser/views/tabs/side_tab.cc
@@ -6,6 +6,7 @@
 
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
+#include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "gfx/path.h"
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index fe1a1db..b84dc20 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -853,7 +853,7 @@ double TabRenderer::GetThrobValue() {
 void TabRenderer::StartCrashAnimation() {
   if (!crash_animation_)
     crash_animation_ = new FavIconCrashAnimation(this);
-  crash_animation_->Reset();
+  crash_animation_->Stop();
   crash_animation_->Start();
 }