diff options
Diffstat (limited to 'ash/wm/compact_layout_manager.h')
| -rw-r--r-- | ash/wm/compact_layout_manager.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ash/wm/compact_layout_manager.h b/ash/wm/compact_layout_manager.h index 8b4f241..9f9843a 100644 --- a/ash/wm/compact_layout_manager.h +++ b/ash/wm/compact_layout_manager.h @@ -25,7 +25,7 @@ namespace internal { // maximized, fill the screen, and only one tabbed browser window is visible at // a time. The status area appears in the top-right corner of the screen. class ASH_EXPORT CompactLayoutManager : public BaseLayoutManager, - public ui::LayerAnimationObserver { + public ui::ImplicitAnimationObserver { public: CompactLayoutManager(); virtual ~CompactLayoutManager(); @@ -48,13 +48,8 @@ class ASH_EXPORT CompactLayoutManager : public BaseLayoutManager, void* old) OVERRIDE; virtual void OnWindowStackingChanged(aura::Window* window) OVERRIDE; - // 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; + // ui::OnImplicitAnimationsCompleted: + virtual void OnImplicitAnimationsCompleted() OVERRIDE; private: FRIEND_TEST_ALL_PREFIXES(CompactLayoutManagerTransitionTest, |