Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Unified Diff: ash/frame/caption_buttons/frame_caption_button_container_view.h

Issue 271913002: Animate window control changes in TouchView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/frame/caption_buttons/frame_caption_button_container_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..113e0c4d4e73b31df462034f40d152b9864d7bd9 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/frame_size_button_delegate.h"
+#include "ui/compositor/layer_animation_observer.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/view.h"
@@ -21,7 +24,8 @@ namespace ash {
class ASH_EXPORT FrameCaptionButtonContainerView
: public views::View,
public views::ButtonListener,
- public FrameSizeButtonDelegate {
+ public FrameSizeButtonDelegate,
+ public ui::ImplicitAnimationObserver {
public:
static const char kViewClassName[];
@@ -136,6 +140,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_;
@@ -152,6 +159,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_
« no previous file with comments | « no previous file | ash/frame/caption_buttons/frame_caption_button_container_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698