diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 05:17:52 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 05:17:52 +0000 |
| commit | e4428d3015351446b5d00b0a8178daba7fd25515 (patch) | |
| tree | efeb3de20c3448b857e113cb49e82813bf4220d0 | |
| parent | 08819ae89715143453b592abe0115ac1d3076003 (diff) | |
| download | chromium_src-e4428d3015351446b5d00b0a8178daba7fd25515.zip chromium_src-e4428d3015351446b5d00b0a8178daba7fd25515.tar.gz chromium_src-e4428d3015351446b5d00b0a8178daba7fd25515.tar.bz2 | |
ash: Add ctrl+search accelerator key to toggle app list.
BUG=116944
TEST=Verify ctrl+search toggle app list.
Review URL: http://codereview.chromium.org/9623019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125561 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 1df6887..5e6a142 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -38,6 +38,7 @@ enum AcceleratorAction { SWITCH_IME, // Switch to another IME depending on the accelerator. TAKE_SCREENSHOT, TAKE_PARTIAL_SCREENSHOT, + TOGGLE_APP_LIST, TOGGLE_CAPS_LOCK, VOLUME_DOWN, VOLUME_MUTE, @@ -102,6 +103,8 @@ const struct AcceleratorData { { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_PRINT, false, false, false, TAKE_SCREENSHOT }, // On Chrome OS, Search key is mapped to LWIN. + { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_LWIN, false, true, false, + TOGGLE_APP_LIST }, { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_LWIN, true, false, false, TOGGLE_CAPS_LOCK }, { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F6, false, false, false, @@ -343,6 +346,9 @@ bool AcceleratorController::AcceleratorPressed( // Return true to prevent propagation of the key event because // this key combination is reserved for partial screenshot. return true; + case TOGGLE_APP_LIST: + ash::Shell::GetInstance()->ToggleAppList(); + break; case TOGGLE_CAPS_LOCK: if (caps_lock_delegate_.get()) return caps_lock_delegate_->HandleToggleCapsLock(); |