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 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. 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 | « ui/aura/aura.gyp ('k') | ui/aura/desktop.cc » ('j') | ui/aura/window.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 ffeed27cd592bc4afc0f1e297e276d711877b557..64e7e3a18140959c1c4872d1ebbbeded6fd75e9b 100644
--- a/ui/aura/desktop.h
+++ b/ui/aura/desktop.h
@@ -25,6 +25,7 @@ class Size;
}
namespace ui {
+class LayerAnimationSequence;
class Transform;
}
@@ -142,7 +143,8 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate,
virtual Desktop* GetDesktop() OVERRIDE;
// Overridden from ui::LayerDelegate:
- virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE;
+ virtual void OnLayerAnimationEnded(
+ const ui::LayerAnimationSequence* animation) OVERRIDE;
// Overridden from FocusManager:
virtual void SetFocusedWindow(Window* window) OVERRIDE;
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/desktop.cc » ('j') | ui/aura/window.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698