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 9e67b93225dee57684abfb17989d77b7b573dac9..385893d81bf89637c249d93c84dbca10a78775b6 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view.h
+++ b/ash/frame/caption_buttons/frame_caption_button_container_view.h
@@ -5,11 +5,19 @@
 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
 
+#include <map>
+
 #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"
 
+namespace ui {
+class Layer;

[flackr, 2014/06/04 22:41:44]

If this is only needed for the override, you can rely on having Layer defined by
including layer_owner_delegate.h.

[jonross, 2014/06/05 15:16:39]

Done.

+}
+
 namespace views {
 class Widget;
 }
@@ -21,7 +29,9 @@ namespace ash {
 class ASH_EXPORT FrameCaptionButtonContainerView
     : public views::View,
       public views::ButtonListener,
-      public FrameSizeButtonDelegate {
+      public FrameSizeButtonDelegate,
+      public ui::ImplicitAnimationObserver,
+      public ui::LayerOwnerDelegate {
  public:
   static const char kViewClassName[];
 
@@ -136,6 +146,13 @@ 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_;
 
@@ -152,6 +169,6 @@ class ASH_EXPORT FrameCaptionButtonContainerView
   DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView);
 };
 
-}  // namesapace ash
+}  // namespace ash
 
 #endif  // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_