diff options
author | kpschoedel <kpschoedel@chromium.org> | 2014-10-07 11:32:41 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 18:32:55 +0000 |
commit | f8e9274eafc1292e9083b470eac32a92846d4d05 (patch) | |
tree | c748dc186cea1665db9b7cdb392c8d7cefb2b92d /ash/accelerators | |
parent | 10af80a21591ea0ce7974b8b043f5462056409d0 (diff) | |
download | chromium_src-f8e9274eafc1292e9083b470eac32a92846d4d05.zip chromium_src-f8e9274eafc1292e9083b470eac32a92846d4d05.tar.gz chromium_src-f8e9274eafc1292e9083b470eac32a92846d4d05.tar.bz2 |
Allow the Ash shortcut Ctrl+Alt+P to work in browser windows.
BUG=416935
Review URL: https://codereview.chromium.org/620423002
Cr-Commit-Position: refs/heads/master@{#298528}
Diffstat (limited to 'ash/accelerators')
-rw-r--r-- | ash/accelerators/accelerator_commands.cc | 6 | ||||
-rw-r--r-- | ash/accelerators/accelerator_commands.h | 3 | ||||
-rw-r--r-- | ash/accelerators/accelerator_controller.cc | 10 |
3 files changed, 11 insertions, 8 deletions
diff --git a/ash/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc index 9fbe5eb..c49ed50 100644 --- a/ash/accelerators/accelerator_commands.cc +++ b/ash/accelerators/accelerator_commands.cc @@ -50,5 +50,11 @@ void ToggleFullscreen() { } } +void ToggleTouchHudProjection() { + base::RecordAction(base::UserMetricsAction("Accel_Touch_Hud_Clear")); + bool enabled = Shell::GetInstance()->is_touch_hud_projection_enabled(); + Shell::GetInstance()->SetTouchHudProjectionEnabled(!enabled); +} + } // namespace accelerators } // namespace ash diff --git a/ash/accelerators/accelerator_commands.h b/ash/accelerators/accelerator_commands.h index df576ba..6c12807 100644 --- a/ash/accelerators/accelerator_commands.h +++ b/ash/accelerators/accelerator_commands.h @@ -25,6 +25,9 @@ ASH_EXPORT void ToggleMaximized(); // by WindowStateDelegate::ToggleFullscreen(). ASH_EXPORT void ToggleFullscreen(); +// Toggles touch HUD. +ASH_EXPORT void ToggleTouchHudProjection(); + } // namespace accelerators } // namespace ash diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 9e28572..d2db14e 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -626,13 +626,6 @@ bool HandleTouchHudModeChange() { return false; } -bool HandleTouchHudProjectToggle() { - base::RecordAction(UserMetricsAction("Accel_Touch_Hud_Clear")); - bool enabled = Shell::GetInstance()->is_touch_hud_projection_enabled(); - Shell::GetInstance()->SetTouchHudProjectionEnabled(!enabled); - return true; -} - bool HandleDisableCapsLock(ui::KeyboardCode key_code, ui::EventType previous_event_type, ui::KeyboardCode previous_key_code) { @@ -942,7 +935,8 @@ bool AcceleratorController::PerformAction(int action, case TOUCH_HUD_MODE_CHANGE: return HandleTouchHudModeChange(); case TOUCH_HUD_PROJECTION_TOGGLE: - return HandleTouchHudProjectToggle(); + accelerators::ToggleTouchHudProjection(); + return true; case DISABLE_GPU_WATCHDOG: Shell::GetInstance()->gpu_support()->DisableGpuWatchdog(); return true; |