| 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 d50350e038bb5a6816ff80704b9be8ec1a4326b7..b9b7d7ae3bfcba714c3702489ea25d99935d49e9 100644
|
| --- a/ash/frame/caption_buttons/frame_caption_button_container_view.h
|
| +++ b/ash/frame/caption_buttons/frame_caption_button_container_view.h
|
| @@ -5,8 +5,11 @@
|
| #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/alternate_frame_size_button_delegate.h"
|
| +#include "ui/compositor/layer_animation_observer.h"
|
| #include "ui/views/controls/button/button.h"
|
| #include "ui/views/view.h"
|
|
|
| @@ -23,7 +26,8 @@ class FrameMaximizeButton;
|
| class ASH_EXPORT FrameCaptionButtonContainerView
|
| : public views::View,
|
| public views::ButtonListener,
|
| - public AlternateFrameSizeButtonDelegate {
|
| + public AlternateFrameSizeButtonDelegate,
|
| + public ui::ImplicitAnimationObserver {
|
| public:
|
| static const char kViewClassName[];
|
|
|
| @@ -142,6 +146,9 @@ class ASH_EXPORT FrameCaptionButtonContainerView
|
| const FrameCaptionButton* to_hover,
|
| const FrameCaptionButton* to_press) OVERRIDE;
|
|
|
| + // ui::ImplicitAnimationObserver:
|
| + virtual void OnImplicitAnimationsCompleted() OVERRIDE;
|
| +
|
| // The widget that the buttons act on.
|
| views::Widget* frame_;
|
|
|
| @@ -158,6 +165,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_
|
|
|