Reland Window Control Animations for TouchView

ash/frame/caption_buttons/frame_caption_button.h

Index: ash/frame/caption_buttons/frame_caption_button.h
diff --git a/ash/frame/caption_buttons/frame_caption_button.h b/ash/frame/caption_buttons/frame_caption_button.h
index 6fd9831ef7f9c51e5f028744228126d19139bbd5..d42d791e21bc5d1d503ebd2a030752d366a99310 100644
--- a/ash/frame/caption_buttons/frame_caption_button.h
+++ b/ash/frame/caption_buttons/frame_caption_button.h
@@ -8,6 +8,7 @@
 #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"
 
@@ -19,7 +20,8 @@ namespace ash {
 
 // Base class for the window caption buttons (minimize, maximize, restore,
 // close).
-class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
+class ASH_EXPORT FrameCaptionButton : public views::CustomButton,
+                                      public ui::LayerOwnerDelegate {
  public:
   enum Animate {
     ANIMATE_YES,
@@ -72,6 +74,10 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
                      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_;