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

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 with master. 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
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 410ace11474528ced8138181083bd90fb09c7f42..89fbe5339b05b9102419cec8379ae8aa49efe1d5 100644
--- a/ui/aura_shell/workspace/workspace_manager.cc
+++ b/ui/aura_shell/workspace/workspace_manager.cc
@@ -117,7 +117,8 @@ void WorkspaceManager::SetOverview(bool overview) {
transform.SetTranslateX(-active_workspace_->bounds().x());
}
- viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
+ aura::Window::ScopedAnimationSettings settings(
+ viewport_->layer()->GetAnimator());
viewport_->layer()->SetTransform(transform);
}
@@ -192,7 +193,8 @@ void WorkspaceManager::UpdateViewport() {
if (active_workspace_) {
ui::Transform transform;
transform.SetTranslateX(-active_workspace_->bounds().x());
- viewport_->layer()->SetAnimation(aura::Window::CreateDefaultAnimation());
+ aura::Window::ScopedAnimationSettings settings(
+ viewport_->layer()->GetAnimator());
viewport_->SetTransform(transform);
}
}

Powered by Google App Engine
This is Rietveld 408576698