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

Unified Diff: ui/aura_shell/workspace/workspace.cc

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 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_shell/shell.cc ('k') | ui/aura_shell/workspace/workspace_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/workspace/workspace.cc
diff --git a/ui/aura_shell/workspace/workspace.cc b/ui/aura_shell/workspace/workspace.cc
index a9574da9617949c80f1b9afee3048f9a8699b772..f661e9279858db52ccc645ea7ab020850e66092e 100644
--- a/ui/aura_shell/workspace/workspace.cc
+++ b/ui/aura_shell/workspace/workspace.cc
@@ -9,6 +9,7 @@
#include "ui/aura/window.h"
#include "ui/aura_shell/workspace/workspace_manager.h"
#include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/compositor/layer_animator.h"
namespace {
// Horizontal margin between windows.
@@ -211,9 +212,13 @@ void Workspace::MoveWindowTo(
else {
gfx::Rect bounds = window->GetTargetBounds();
bounds.set_origin(origin);
- if (animate)
- window->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
- window->SetBounds(bounds);
+ if (animate) {
+ ui::LayerAnimator::ScopedSettings settings(
+ window->layer()->GetAnimator());
+ window->SetBounds(bounds);
+ } else {
+ window->SetBounds(bounds);
+ }
}
}
« no previous file with comments | « ui/aura_shell/shell.cc ('k') | ui/aura_shell/workspace/workspace_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698