Revert or Reland Window Control Animations for TouchView

ash/frame/caption_buttons/frame_caption_button.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
 
 #include "ash/ash_export.h"
 #include "ash/frame/caption_buttons/caption_button_types.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/compositor/layer_owner_delegate.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/custom_button.h"
 
 namespace gfx {
 class SlideAnimation;
 }
 
 namespace ash {
 
 // Base class for the window caption buttons (minimize, maximize, restore,
 // close).
-class ASH_EXPORT FrameCaptionButton : public views::CustomButton,
-                                      public ui::LayerOwnerDelegate {
+class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
  public:
   enum Animate {
     ANIMATE_YES,
     ANIMATE_NO
   };
 
   static const char kViewClassName[];
 
   FrameCaptionButton(views::ButtonListener* listener, CaptionButtonIcon icon);
   virtual ~FrameCaptionButton();
@@ skipping 32 matching lines @@
 
  private:
   // Returns the icon image to paint based on |paint_as_active_|.
   const gfx::ImageSkia& GetIconImageToPaint() const;
 
   // Paints |to_center| centered within the button with |alpha|.
   void PaintCentered(gfx::Canvas* canvas,
                      const gfx::ImageSkia& to_center,
                      int alpha);
 
-  // ui::LayerOwnerDelegate:
-  virtual void OnLayerRecreated(ui::Layer* old_layer,
-                                ui::Layer* new_layer) OVERRIDE;
-
   // The button's current icon.
   CaptionButtonIcon icon_;
 
   // Whether the button should be painted as active.
   bool paint_as_active_;
 
   // The images and image ids used to paint the button.
   int icon_image_id_;
   int inactive_icon_image_id_;
   int hovered_background_image_id_;
   int pressed_background_image_id_;
   gfx::ImageSkia icon_image_;
   gfx::ImageSkia inactive_icon_image_;
   gfx::ImageSkia hovered_background_image_;
   gfx::ImageSkia pressed_background_image_;
 
   // The icon image to crossfade from.
   gfx::ImageSkia crossfade_icon_image_;
 
   // Crossfade animation started when the button's images are changed by
   // SetImages().
   scoped_ptr<gfx::SlideAnimation> swap_images_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton);
 };
 
 }  // namespace ash
 
 #endif  // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_