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

Unified Diff: ash/wm/compact_layout_manager.cc

Issue 9320018: Revert 120092 - Reland 120074 -- Disable animations during aura tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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 | « ash/wm/compact_layout_manager.h ('k') | ash/wm/shelf_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/compact_layout_manager.cc
===================================================================
--- ash/wm/compact_layout_manager.cc (revision 120096)
+++ ash/wm/compact_layout_manager.cc (working copy)
@@ -140,11 +140,20 @@
/////////////////////////////////////////////////////////////////////////////
// CompactLayoutManager, AnimationDelegate overrides:
-void CompactLayoutManager::OnImplicitAnimationsCompleted() {
+void CompactLayoutManager::OnLayerAnimationEnded(
+ const ui::LayerAnimationSequence* animation) {
if (!GetDefaultContainerLayer()->GetAnimator()->is_animating())
HideWindows();
}
+void CompactLayoutManager::OnLayerAnimationScheduled(
+ const ui::LayerAnimationSequence* animation) {
+}
+
+void CompactLayoutManager::OnLayerAnimationAborted(
+ const ui::LayerAnimationSequence* animation) {
+}
+
//////////////////////////////////////////////////////////////////////////////
// CompactLayoutManager, private:
« no previous file with comments | « ash/wm/compact_layout_manager.h ('k') | ash/wm/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698