Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: ash/accelerators/accelerator_table.cc

Issue 10534053: ash/chromeos: "Search" key to toggle app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for nit in #2 Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/accelerators/accelerator_table.h" 5 #include "ash/accelerators/accelerator_table.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "ui/base/events.h" 8 #include "ui/base/events.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW }, 47 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW },
48 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB }, 48 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB },
49 49
50 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR }, 50 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR },
51 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, 51 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB },
52 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, 52 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT },
53 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 53 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
54 TAKE_PARTIAL_SCREENSHOT }, 54 TAKE_PARTIAL_SCREENSHOT },
55 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, 55 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
56 // On Chrome OS, Search key is mapped to LWIN. 56 // On Chrome OS, Search key is mapped to LWIN.
57 { true, ui::VKEY_LWIN, ui::EF_NONE, SEARCH_KEY }, 57 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
58 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, SEARCH_KEY }, 58 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST },
59 { true, ui::VKEY_LWIN, ui::EF_CONTROL_DOWN, TOGGLE_APP_LIST },
60 { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK }, 59 { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK },
61 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN }, 60 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN },
62 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP }, 61 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP },
63 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE }, 62 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE },
64 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 63 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
65 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN }, 64 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN },
66 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 65 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
67 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, 66 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP },
68 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, 67 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
69 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, 68 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER },
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 arraysize(kActionsAllowedAtLoginOrLockScreen); 146 arraysize(kActionsAllowedAtLoginOrLockScreen);
148 147
149 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 148 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
150 EXIT, 149 EXIT,
151 }; 150 };
152 151
153 const size_t kActionsAllowedAtLockScreenLength = 152 const size_t kActionsAllowedAtLockScreenLength =
154 arraysize(kActionsAllowedAtLockScreen); 153 arraysize(kActionsAllowedAtLockScreen);
155 154
156 } // namespace ash 155 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698