Separate debug shortcuts into another array in ash accelerator table.

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 
@@ skipping 135 matching lines @@
       case Shell::BACKWARD:
         shell->focus_cycler()->RotateFocus(internal::FocusCycler::BACKWARD);
         break;
     }
   }
   return true;
 }
 
 // Rotates the default window container.
 bool HandleRotateWindows() {
-  if (!DebugShortcutsEnabled())
-    return true;
-
   aura::Window* target =
       Shell::GetPrimaryRootWindowController()->GetContainer(
           internal::kShellWindowId_DefaultContainer);
   scoped_ptr<ui::LayerAnimationSequence> screen_rotation(
       new ui::LayerAnimationSequence(new ash::ScreenRotation(360)));
   target->layer()->GetAnimator()->StartAnimation(
       screen_rotation.release());
   return true;
 }
 
 // Rotates the screen.
 bool HandleRotateScreen() {
-  if (!DebugShortcutsEnabled())
-    return true;
-
   static int i = 0;
   int delta = 0;
   switch (i) {
     case 0: delta = 90; break;
     case 1: delta = 90; break;
     case 2: delta = 90; break;
     case 3: delta = 90; break;
     case 4: delta = -90; break;
     case 5: delta = -90; break;
     case 6: delta = -90; break;
@@ skipping 11 matching lines @@
       set_preemption_strategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
   scoped_ptr<ui::LayerAnimationSequence> screen_rotation(
       new ui::LayerAnimationSequence(new ash::ScreenRotation(delta)));
   screen_rotation->AddObserver(root_window);
   root_window->layer()->GetAnimator()->
       StartAnimation(screen_rotation.release());
   return true;
 }
 
 bool HandleToggleDesktopBackgroundMode() {
-  if (!DebugShortcutsEnabled())
-    return true;
-
   DesktopBackgroundController* desktop_background_controller =
       Shell::GetInstance()->desktop_background_controller();
   if (desktop_background_controller->desktop_background_mode() ==
       DesktopBackgroundController::BACKGROUND_IMAGE) {
     desktop_background_controller->SetDesktopBackgroundSolidColorMode(
         SK_ColorBLACK);
   } else {
     ash::Shell::GetInstance()->user_wallpaper_delegate()->
         InitializeWallpaper();
   }
   return true;
 }
 
 bool HandleToggleRootWindowFullScreen() {
-  if (!DebugShortcutsEnabled())
-    return true;
-
   Shell::GetPrimaryRootWindow()->ToggleFullScreen();
   return true;
 }
 
 // Magnify the screen
 bool HandleMagnifyScreen(int delta_index) {
   // TODO(yoshiki): Create the class like MagnifierStepScaleController, and
   // move the following scale control to it.
   float scale =
        ash::Shell::GetInstance()->magnification_controller()->GetScale();
@@ skipping 69 matching lines @@
     actions_allowed_at_lock_screen_.insert(
         kActionsAllowedAtLoginOrLockScreen[i]);
   }
   for (size_t i = 0; i < kActionsAllowedAtLockScreenLength; ++i) {
     actions_allowed_at_lock_screen_.insert(kActionsAllowedAtLockScreen[i]);
   }
   for (size_t i = 0; i < kReservedActionsLength; ++i) {
     reserved_actions_.insert(kReservedActions[i]);
   }
 
-  for (size_t i = 0; i < kAcceleratorDataLength; ++i) {
-    ui::Accelerator accelerator(kAcceleratorData[i].keycode,
-                                kAcceleratorData[i].modifiers);
-    accelerator.set_type(kAcceleratorData[i].trigger_on_press ?
-                         ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED);
-    Register(accelerator, this);
-    accelerators_.insert(
-        std::make_pair(accelerator, kAcceleratorData[i].action));
-  }
+  RegisterAccelerators(kAcceleratorData, kAcceleratorDataLength);
+
+  if (DebugShortcutsEnabled())
+    RegisterAccelerators(kDebugAcceleratorData, kDebugAcceleratorDataLength);
 }
 
 void AcceleratorController::Register(const ui::Accelerator& accelerator,
                                      ui::AcceleratorTarget* target) {
   accelerator_manager_->Register(accelerator,
                                  ui::AcceleratorManager::kNormalPriority,
                                  target);
 }
 
 void AcceleratorController::Unregister(const ui::Accelerator& accelerator,
@@ skipping 301 matching lines @@
     }
     case ROTATE_WINDOWS:
       return HandleRotateWindows();
     case ROTATE_SCREEN:
       return HandleRotateScreen();
     case TOGGLE_DESKTOP_BACKGROUND_MODE:
       return HandleToggleDesktopBackgroundMode();
     case TOGGLE_ROOT_WINDOW_FULL_SCREEN:
       return HandleToggleRootWindowFullScreen();
     case DISPLAY_ADD_REMOVE:
-      if (DebugShortcutsEnabled())
-        internal::MultiDisplayManager::AddRemoveDisplay();
+      internal::MultiDisplayManager::AddRemoveDisplay();
       return true;
     case DISPLAY_CYCLE:
-      if (DebugShortcutsEnabled())
-        internal::MultiDisplayManager::CycleDisplay();
+      internal::MultiDisplayManager::CycleDisplay();
       return true;
     case DISPLAY_TOGGLE_SCALE:
-      if (DebugShortcutsEnabled())
-        internal::MultiDisplayManager::ToggleDisplayScale();
+      internal::MultiDisplayManager::ToggleDisplayScale();
       return true;
     case MAGNIFY_SCREEN_ZOOM_IN:
       return HandleMagnifyScreen(1);
     case MAGNIFY_SCREEN_ZOOM_OUT:
       return HandleMagnifyScreen(-1);
 #if !defined(NDEBUG)
     case PRINT_LAYER_HIERARCHY:
       return HandlePrintLayerHierarchy();
     case PRINT_VIEW_HIERARCHY:
       return HandlePrintViewHierarchy();
@@ skipping 70 matching lines @@
   // There are two ways how found_index can be valid: a.) the nth item was
   // found (which is true when indexes_left is -1) or b.) the last item was
   // requested (which is true when index was passed in as a negative number).
   if (found_index >= 0 && (indexes_left == -1 || window < 0) &&
       items[found_index].status == ash::STATUS_RUNNING) {
     // Then set this one as active.
     Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
   }
 }
 
+void AcceleratorController::RegisterAccelerators(
+    const AcceleratorData accelerators[],
+    size_t accelerators_length) {
+  for (size_t i = 0; i < accelerators_length; ++i) {
+    ui::Accelerator accelerator(accelerators[i].keycode,
+                                accelerators[i].modifiers);
+    accelerator.set_type(accelerators[i].trigger_on_press ?
+                         ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED);
+    Register(accelerator, this);
+    accelerators_.insert(
+        std::make_pair(accelerator, accelerators[i].action));
+  }
+}
+
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash