summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/accelerator_table.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-20 03:12:12 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-20 03:12:12 +0000
commitcae97656821756121ae569faa1100963c8b5d4d2 (patch)
tree244ffc6a91916c8f81889deec8e3aa6090fb3227 /ash/accelerators/accelerator_table.cc
parent9bbb5c279cb33ee4ce45c8fe0c03e022f158a159 (diff)
downloadchromium_src-cae97656821756121ae569faa1100963c8b5d4d2.zip
chromium_src-cae97656821756121ae569faa1100963c8b5d4d2.tar.gz
chromium_src-cae97656821756121ae569faa1100963c8b5d4d2.tar.bz2
Move a lot of ChromeOS stuff out of Browser and onto various Ash-related helpers.
BUG=none TEST=none TBR=davemoore Review URL: https://chromiumcodereview.appspot.com/10035061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_table.cc')
-rw-r--r--ash/accelerators/accelerator_table.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index cf841b3..47690f9 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -39,6 +39,7 @@ const AcceleratorData kAcceleratorData[] = {
{ ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_L, true, true, false, LOCK_SCREEN },
{ ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_M, false, true, false,
OPEN_FILE_MANAGER },
+ { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_T, false, true, true, OPEN_CROSH },
#endif
{ ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_Q, true, true, false, EXIT },
{ ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_N, true, true, false,
@@ -54,7 +55,7 @@ const AcceleratorData kAcceleratorData[] = {
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 },
+ SEARCH_KEY },
{ 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,