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

Unified Diff: ash/wm/workspace_controller.cc

Issue 11417150: Implement workspace scrubbing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years 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_controller.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 0f739848767e208a03f89bb6b8f9d2cbc17fcbf2..03b8eb7298d1b299bc625ac24c77c4cd11712fc7 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -6,6 +6,7 @@
#include "ash/ash_switches.h"
#include "ash/wm/window_util.h"
+#include "ash/wm/workspace/workspace_cycler.h"
#include "ash/wm/workspace/workspace_manager.h"
#include "base/command_line.h"
#include "ui/aura/client/activation_client.h"
@@ -17,9 +18,14 @@ namespace ash {
namespace internal {
WorkspaceController::WorkspaceController(aura::Window* viewport)
- : viewport_(viewport) {
+ : viewport_(viewport),
+ workspace_cycler_(NULL) {
aura::RootWindow* root_window = viewport->GetRootWindow();
workspace_manager_.reset(new WorkspaceManager(viewport));
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshEnableWorkspaceScrubbing)) {
+ workspace_cycler_.reset(new WorkspaceCycler(workspace_manager_.get()));
+ }
aura::client::GetActivationClient(root_window)->AddObserver(this);
}
« no previous file with comments | « ash/wm/workspace_controller.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698