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

Unified Diff: ui/aura/desktop.h

Issue 8395046: Allows observers to be notified when layer animations complete. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address reviewer comments. Created 9 years, 2 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 | ui/aura/desktop.cc » ('j') | ui/gfx/compositor/layer_animation_observer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop.h
diff --git a/ui/aura/desktop.h b/ui/aura/desktop.h
index 9ee5c1d7f2b0ec939bd755ab1c1eff616d81eb07..7a58b48a67ed35b64d6ba58ad4bbb107aedd0dbc 100644
--- a/ui/aura/desktop.h
+++ b/ui/aura/desktop.h
@@ -17,6 +17,7 @@
#include "ui/aura/window.h"
#include "ui/base/events.h"
#include "ui/gfx/compositor/compositor.h"
+#include "ui/gfx/compositor/layer_animation_observer.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/point.h"
@@ -42,7 +43,8 @@ class TouchEvent;
// Desktop is responsible for hosting a set of windows.
class AURA_EXPORT Desktop : public ui::CompositorDelegate,
public Window,
- public internal::FocusManager {
+ public internal::FocusManager,
+ public ui::LayerAnimationObserver {
public:
Desktop();
virtual ~Desktop();
@@ -146,9 +148,13 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate,
virtual internal::FocusManager* GetFocusManager() OVERRIDE;
virtual Desktop* GetDesktop() OVERRIDE;
- // Overridden from ui::LayerDelegate:
+ // Overridden from ui::LayerAnimationObserver:
virtual void OnLayerAnimationEnded(
const ui::LayerAnimationSequence* animation) OVERRIDE;
+ virtual void OnLayerAnimationScheduled(
+ const ui::LayerAnimationSequence* animation) OVERRIDE;
+ virtual void OnLayerAnimationAborted(
+ const ui::LayerAnimationSequence* animation) OVERRIDE;
// Overridden from FocusManager:
virtual void SetFocusedWindow(Window* window) OVERRIDE;
« no previous file with comments | « no previous file | ui/aura/desktop.cc » ('j') | ui/gfx/compositor/layer_animation_observer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698