3 files changed, 7 insertions, 3 deletions
diff --git a/views/animation/bounds_animator.cc b/views/animation/bounds_animator.cc
index 6a16af5..ad17ec9 100644
--- a/views/animation/bounds_animator.cc
+++ b/views/animation/bounds_animator.cc
@@ -4,6 +4,7 @@
 
 #include "views/animation/bounds_animator.h"
 
+#include "app/animation_container.h"
 #include "app/slide_animation.h"
 #include "base/scoped_ptr.h"
 #include "views/view.h"
diff --git a/views/animation/bounds_animator.h b/views/animation/bounds_animator.h
index ce8dcb2..5e5d976 100644
--- a/views/animation/bounds_animator.h
+++ b/views/animation/bounds_animator.h
@@ -8,10 +8,12 @@
 
 #include <map>
 
-#include "app/animation_container.h"
+#include "app/animation_container_observer.h"
 #include "app/animation_delegate.h"
+#include "base/ref_counted.h"
 #include "gfx/rect.h"
 
+class AnimationContainer;
 class SlideAnimation;
 
 namespace views {
@@ -36,7 +38,7 @@ class BoundsAnimatorObserver {
 // by way of SetAnimationDelegate. Additionally you can attach an observer to
 // the BoundsAnimator that is notified when all animations are complete.
 class BoundsAnimator : public AnimationDelegate,
-                       public AnimationContainer::Observer {
+                       public AnimationContainerObserver {
  public:
   // If |delete_when_done| is set to true in |SetAnimationDelegate| the
   // |AnimationDelegate| must subclass this class.
@@ -147,7 +149,7 @@ class BoundsAnimator : public AnimationDelegate,
   virtual void AnimationEnded(const Animation* animation);
   virtual void AnimationCanceled(const Animation* animation);
 
-  // AnimationContainer::Observer overrides.
+  // AnimationContainerObserver overrides.
   virtual void AnimationContainerProgressed(AnimationContainer* container);
   virtual void AnimationContainerEmpty(AnimationContainer* container);
 
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index f758910..578be80 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -8,6 +8,7 @@
 
 #include "app/throb_animation.h"
 #include "app/resource_bundle.h"
+#include "base/logging.h"
 #include "gfx/canvas_skia.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"