diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 06:19:04 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 06:19:04 +0000 |
| commit | 987eb23f86237972209d362023622e7887ae7e62 (patch) | |
| tree | 60f68d3fc574686051d90249ddc26582ce51357a /ash/accelerators/accelerator_controller.cc | |
| parent | f08b15fa2b654cf26bc23657d135056c4d307880 (diff) | |
| download | chromium_src-987eb23f86237972209d362023622e7887ae7e62.zip chromium_src-987eb23f86237972209d362023622e7887ae7e62.tar.gz chromium_src-987eb23f86237972209d362023622e7887ae7e62.tar.bz2 | |
Revert 195733
>Add debug shortcuts that toggles options to shows paint rects, debug borders and fps counters.
>Cleanup: Separate desktop shortcuts which are useful only on linux desktop, and debug shortcuts.
>
>BUG=227375
>Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=195733
TBR=oshima@chromium.org
BUG=
Review URL: https://codereview.chromium.org/14311006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195741 0039d316-1c4b-4281-b951-d872f2087c98
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: |