diff options
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 9bf6a35..6450c87 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -12,7 +12,6 @@ #include "ash/accelerators/accelerator_table.h" #include "ash/ash_switches.h" #include "ash/caps_lock_delegate.h" -#include "ash/debug.h" #include "ash/desktop_background/desktop_background_controller.h" #include "ash/desktop_background/user_wallpaper_delegate.h" #include "ash/display/display_controller.h" @@ -375,10 +374,6 @@ void AcceleratorController::Init() { RegisterAccelerators(kAcceleratorData, kAcceleratorDataLength); -#if !defined(NDEBUG) - RegisterAccelerators(kDesktopAcceleratorData, kDesktopAcceleratorDataLength); -#endif - if (DebugShortcutsEnabled()) RegisterAccelerators(kDebugAcceleratorData, kDebugAcceleratorDataLength); @@ -819,18 +814,9 @@ bool AcceleratorController::PerformAction(int action, return HandleToggleDesktopBackgroundMode(); case TOGGLE_ROOT_WINDOW_FULL_SCREEN: return HandleToggleRootWindowFullScreen(); - case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR: + case DISPLAY_TOGGLE_SCALE: internal::DisplayManager::ToggleDisplayScaleFactor(); return true; - case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS: - ash::debug::ToggleShowDebugBorders(); - return true; - case DEBUG_TOGGLE_SHOW_FPS_COUNTER: - ash::debug::ToggleShowFpsCounter(); - return true; - case DEBUG_TOGGLE_SHOW_PAINT_RECTS: - ash::debug::ToggleShowPaintRects(); - return true; case MAGNIFY_SCREEN_ZOOM_IN: return HandleMagnifyScreen(1); case MAGNIFY_SCREEN_ZOOM_OUT: |