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

Unified Diff: ash/wm/workspace/workspace2.cc

Issue 11106003: Tweaks workspace animation code per latest from Nicholas. Additionally (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk Created 8 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 | « ash/wm/workspace/desktop_background_fade_controller.cc ('k') | ash/wm/workspace/workspace_animations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace2.cc
diff --git a/ash/wm/workspace/workspace2.cc b/ash/wm/workspace/workspace2.cc
index 089e83c48ed0a0f42978178f104519a06a6db6a0..f495c5db10ccd49775776fe004806657e6371a68 100644
--- a/ash/wm/workspace/workspace2.cc
+++ b/ash/wm/workspace/workspace2.cc
@@ -6,6 +6,7 @@
#include "ash/shell_window_ids.h"
#include "ash/wm/property_util.h"
+#include "ash/wm/window_animations.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
#include "ash/wm/workspace/workspace_event_handler.h"
@@ -26,6 +27,7 @@ Workspace2::Workspace2(WorkspaceManager2* manager,
workspace_layout_manager_(NULL) {
window_->SetProperty(internal::kChildWindowVisibilityChangesAnimatedKey,
true);
+ SetWindowVisibilityAnimationTransition(window_, ANIMATE_NONE);
window_->set_id(kShellWindowId_WorkspaceContainer);
window_->SetName("WorkspaceContainer");
window_->Init(ui::LAYER_NOT_DRAWN);
« no previous file with comments | « ash/wm/workspace/desktop_background_fade_controller.cc ('k') | ash/wm/workspace/workspace_animations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698