Reland Window Control Animations for TouchView

ash/frame/caption_buttons/frame_caption_button_container_view.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_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;
 }
 
 namespace ash {
 
 // Container view for the frame caption buttons. It performs the appropriate
 // action when a caption button is clicked.
 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[];
 
   // Whether the frame can be minimized (either via the maximize/restore button
   // or via a dedicated button).
   enum MinimizeAllowed {
     MINIMIZE_ALLOWED,
     MINIMIZE_DISALLOWED
   };
 
@@ skipping 94 matching lines @@
   virtual void SetButtonsToNormal(Animate animate) OVERRIDE;
   virtual void SetButtonIcons(CaptionButtonIcon minimize_button_icon,
                               CaptionButtonIcon close_button_icon,
                               Animate animate) OVERRIDE;
   virtual const FrameCaptionButton* GetButtonClosestTo(
       const gfx::Point& position_in_screen) const OVERRIDE;
   virtual void SetHoveredAndPressedButtons(
       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_;
 
   // The buttons. In the normal button style, at most one of |minimize_button_|
   // and |size_button_| is visible.
   FrameCaptionButton* minimize_button_;
   FrameCaptionButton* size_button_;
   FrameCaptionButton* close_button_;
 
   // Mapping of the images needed to paint a button for each of the values of
   // CaptionButtonIcon.
   std::map<CaptionButtonIcon, ButtonIconIds> button_icon_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView);
 };
 
-}  // namesapace ash
+}  // namespace ash
 
 #endif  // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_