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

Unified Diff: ui/aura_shell/workspace/workspace_manager.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/workspace/workspace.cc ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/workspace/workspace_manager.cc
diff --git a/ui/aura_shell/workspace/workspace_manager.cc b/ui/aura_shell/workspace/workspace_manager.cc
index 4a6ecaa7ee52f81381c2be1ffd637e85cbe0b173..c8904ea695d310abf48015158891112a05e3634b 100644
--- a/ui/aura_shell/workspace/workspace_manager.cc
+++ b/ui/aura_shell/workspace/workspace_manager.cc
@@ -131,7 +131,7 @@ void WorkspaceManager::SetOverview(bool overview) {
transform.SetTranslateX(-active_workspace_->bounds().x());
}
- viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
+ ui::LayerAnimator::ScopedSettings settings(viewport_->layer()->GetAnimator());
viewport_->layer()->SetTransform(transform);
}
@@ -247,7 +247,8 @@ void WorkspaceManager::UpdateViewport() {
if (active_workspace_) {
ui::Transform transform;
transform.SetTranslateX(-active_workspace_->bounds().x());
- viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
+ ui::LayerAnimator::ScopedSettings settings(
+ viewport_->layer()->GetAnimator());
viewport_->SetTransform(transform);
}
}
« no previous file with comments | « ui/aura_shell/workspace/workspace.cc ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698