Separate debugging and developer accelerators

ash/common/accelerators/debug_commands.cc

Index: ash/common/accelerators/debug_commands.cc
diff --git a/ash/common/accelerators/debug_commands.cc b/ash/common/accelerators/debug_commands.cc
index e9872e567200883999fa5349d118e79c88ff5215..f8e9ad36cf3341d6345bdeb6fb46249022603a88 100644
--- a/ash/common/accelerators/debug_commands.cc
+++ b/ash/common/accelerators/debug_commands.cc
@@ -9,7 +9,6 @@
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/toast/toast_data.h"
 #include "ash/common/system/toast/toast_manager.h"
-#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
@@ -86,13 +85,6 @@ void HandleToggleTouchscreen() {
   ash::WmShell::Get()->delegate()->ToggleTouchscreen();
 }
 
-void HandleToggleToggleTouchView() {
-  MaximizeModeController* controller =
-      WmShell::Get()->maximize_mode_controller();
-  controller->EnableMaximizeModeWindowManager(
-      !controller->IsMaximizeModeWindowManagerEnabled());
-}
-
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace
@@ -111,6 +103,11 @@ bool DebugAcceleratorsEnabled() {
       switches::kAshDebugShortcuts);
 }
 
+bool DeveloperAcceleratorsEnabled() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kAshDeveloperShortcuts);
+}
+
 void PerformDebugActionIfEnabled(AcceleratorAction action) {
   if (!DebugAcceleratorsEnabled())
     return;
@@ -128,9 +125,6 @@ void PerformDebugActionIfEnabled(AcceleratorAction action) {
     case DEBUG_TOGGLE_TOUCH_SCREEN:
       HandleToggleTouchscreen();
       break;
-    case DEBUG_TOGGLE_TOUCH_VIEW:
-      HandleToggleToggleTouchView();
-      break;
 #endif
     case DEBUG_PRINT_LAYER_HIERARCHY:
       HandlePrintLayerHierarchy();