| 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 113e0c4d4e73b31df462034f40d152b9864d7bd9..9e67b93225dee57684abfb17989d77b7b573dac9 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,8 @@
|
| #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/views/controls/button/button.h"
|
| #include "ui/views/view.h"
|
|
|
| @@ -24,8 +21,7 @@
|
| class ASH_EXPORT FrameCaptionButtonContainerView
|
| : public views::View,
|
| public views::ButtonListener,
|
| - public FrameSizeButtonDelegate,
|
| - public ui::ImplicitAnimationObserver {
|
| + public FrameSizeButtonDelegate {
|
| public:
|
| static const char kViewClassName[];
|
|
|
| @@ -140,9 +136,6 @@
|
| 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_;
|
|
|
| @@ -159,6 +152,6 @@
|
| DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView);
|
| };
|
|
|
| -} // namespace ash
|
| +} // namesapace ash
|
|
|
| #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
|
|
|