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

Unified Diff: athena/wm/window_overview_mode.cc

Issue 464163005: athena: Fix switching to a window of a different size. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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 | « athena/wm/window_manager_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/window_overview_mode.cc
diff --git a/athena/wm/window_overview_mode.cc b/athena/wm/window_overview_mode.cc
index 8677e42a9c15396d69353a794618ec6754c85e56..b34229309a2c5326c51df2b892a8cd3cdf656cbe 100644
--- a/athena/wm/window_overview_mode.cc
+++ b/athena/wm/window_overview_mode.cc
@@ -198,13 +198,9 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
window->layer()->GetAnimator();
// Unset any in-progress animation.
- {
- ui::ScopedLayerAnimationSettings settings(animator);
- settings.SetPreemptionStrategy(
- ui::LayerAnimator::IMMEDIATELY_SET_NEW_TARGET);
- window->Show();
- window->SetTransform(gfx::Transform());
- }
+ animator->AbortAllAnimations();
+ window->Show();
+ window->SetTransform(gfx::Transform());
// Setup the animation.
{
ui::ScopedLayerAnimationSettings settings(animator);
« no previous file with comments | « athena/wm/window_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698