Revert or Reland Window Control Animations for TouchView

ash/frame/caption_buttons/frame_caption_button_container_view.h

Index: ash/frame/caption_buttons/frame_caption_button_container_view.h
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.h b/ash/frame/caption_buttons/frame_caption_button_container_view.h
index 39191b27a40ea5b9a6132e5f49f7c78d3a51fe90..579d5cd7b589e2dbe8ac40efa8d01317e122ba5b 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view.h
+++ b/ash/frame/caption_buttons/frame_caption_button_container_view.h
@@ -9,8 +9,6 @@
 
 #include "ash/ash_export.h"
 #include "ash/frame/caption_buttons/frame_size_button_delegate.h"
-#include "ui/compositor/layer_animation_observer.h"
-#include "ui/compositor/layer_owner_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
@@ -25,9 +23,7 @@ namespace ash {
 class ASH_EXPORT FrameCaptionButtonContainerView
     : public views::View,
       public views::ButtonListener,
-      public FrameSizeButtonDelegate,
-      public ui::ImplicitAnimationObserver,
-      public ui::LayerOwnerDelegate {
+      public FrameSizeButtonDelegate {
  public:
   static const char kViewClassName[];
 
@@ -142,13 +138,6 @@ class ASH_EXPORT FrameCaptionButtonContainerView
       const FrameCaptionButton* to_hover,
       const FrameCaptionButton* to_press) OVERRIDE;
 
-  // ui::ImplicitAnimationObserver:
-  virtual void OnImplicitAnimationsCompleted() OVERRIDE;
-
-  // ui::LayerOwnerDelegate:
-  virtual void OnLayerRecreated(ui::Layer* old_layer,
-                                ui::Layer* new_layer) OVERRIDE;
-
   // The widget that the buttons act on.
   views::Widget* frame_;