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

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

Issue 12212040: Make the workspace cycler animation parameters editable via chrome://gesture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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: ash/wm/workspace/workspace_manager.cc
diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc
index 17ba261b769efeb5dabaeea30ec9286656f2cb83..819cdd464678c8c7e36e682ea5f79e64a960fabf 100644
--- a/ash/wm/workspace/workspace_manager.cc
+++ b/ash/wm/workspace/workspace_manager.cc
@@ -7,7 +7,6 @@
#include <algorithm>
#include <functional>
-#include "ash/ash_switches.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
@@ -23,10 +22,10 @@
#include "ash/wm/workspace/workspace_animations.h"
#include "ash/wm/workspace/workspace_cycler.h"
#include "ash/wm/workspace/workspace_cycler_animator.h"
+#include "ash/wm/workspace/workspace_cycler_configuration.h"
#include "ash/wm/workspace/workspace_layout_manager.h"
#include "ash/wm/workspace/workspace.h"
#include "base/auto_reset.h"
-#include "base/command_line.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "ui/aura/client/aura_constants.h"
@@ -127,10 +126,8 @@ WorkspaceManager::WorkspaceManager(Window* contents_view)
active_workspace_->window()->Show();
Shell::GetInstance()->AddShellObserver(this);
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kAshEnableWorkspaceScrubbing)) {
+ if (ash::WorkspaceCyclerConfiguration::IsCyclerEnabled())
workspace_cycler_.reset(new WorkspaceCycler(this));
- }
}
WorkspaceManager::~WorkspaceManager() {

Powered by Google App Engine
This is Rietveld 408576698