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

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

Issue 10414064: Handle more browser commands in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build of ShellDelegateImpl Created 8 years, 7 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 20 matching lines...) Expand all
31 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, 31 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN },
32 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, 32 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP },
33 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, 33 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN },
34 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER }, 34 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER },
35 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, 35 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
36 #endif 36 #endif
37 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, 37 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
38 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 38 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
39 TOGGLE_SPOKEN_FEEDBACK }, 39 TOGGLE_SPOKEN_FEEDBACK },
40 40
41 // When you change the shortcut for NEW_INCOGNITO_WINDOW or NEW_WINDOW, 41 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or
42 // you also need to modify ToolbarView::GetAcceleratorForCommandId() in 42 // NEW_TAB, you also need to modify
43 // ToolbarView::GetAcceleratorForCommandId() in
43 // chrome/browser/ui/views/toolbar_view.cc. 44 // chrome/browser/ui/views/toolbar_view.cc.
44 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 45 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
45 NEW_INCOGNITO_WINDOW }, 46 NEW_INCOGNITO_WINDOW },
46 { 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 },
47 49
48 { 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 },
49 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, 52 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT },
50 { 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,
51 TAKE_PARTIAL_SCREENSHOT }, 54 TAKE_PARTIAL_SCREENSHOT },
52 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, 55 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
53 // On Chrome OS, Search key is mapped to LWIN. 56 // On Chrome OS, Search key is mapped to LWIN.
54 { true, ui::VKEY_LWIN, ui::EF_NONE, SEARCH_KEY }, 57 { true, ui::VKEY_LWIN, ui::EF_NONE, SEARCH_KEY },
55 { true, ui::VKEY_LWIN, ui::EF_CONTROL_DOWN, TOGGLE_APP_LIST }, 58 { true, ui::VKEY_LWIN, ui::EF_CONTROL_DOWN, TOGGLE_APP_LIST },
56 { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK }, 59 { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK },
57 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN }, 60 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN },
58 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP }, 61 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP },
59 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE }, 62 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE },
60 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 63 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
61 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN }, 64 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN },
62 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 65 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
63 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, 66 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP },
64 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, 67 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
65 { 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 },
66 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_TRAY }, 69 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_TRAY },
67 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 70 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
68 SHOW_KEYBOARD_OVERLAY }, 71 SHOW_KEYBOARD_OVERLAY },
69 { true, ui::VKEY_OEM_2, 72 { true, ui::VKEY_OEM_2,
70 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 73 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
71 SHOW_KEYBOARD_OVERLAY }, 74 SHOW_KEYBOARD_OVERLAY },
72 { true, ui::VKEY_F1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK }, 75 { true, ui::VKEY_F1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK },
76 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER },
73 { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 }, 77 { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 },
74 { true, ui::VKEY_2, ui::EF_ALT_DOWN, SELECT_WIN_1 }, 78 { true, ui::VKEY_2, ui::EF_ALT_DOWN, SELECT_WIN_1 },
75 { true, ui::VKEY_3, ui::EF_ALT_DOWN, SELECT_WIN_2 }, 79 { true, ui::VKEY_3, ui::EF_ALT_DOWN, SELECT_WIN_2 },
76 { true, ui::VKEY_4, ui::EF_ALT_DOWN, SELECT_WIN_3 }, 80 { true, ui::VKEY_4, ui::EF_ALT_DOWN, SELECT_WIN_3 },
77 { true, ui::VKEY_5, ui::EF_ALT_DOWN, SELECT_WIN_4 }, 81 { true, ui::VKEY_5, ui::EF_ALT_DOWN, SELECT_WIN_4 },
78 { true, ui::VKEY_6, ui::EF_ALT_DOWN, SELECT_WIN_5 }, 82 { true, ui::VKEY_6, ui::EF_ALT_DOWN, SELECT_WIN_5 },
79 { true, ui::VKEY_7, ui::EF_ALT_DOWN, SELECT_WIN_6 }, 83 { true, ui::VKEY_7, ui::EF_ALT_DOWN, SELECT_WIN_6 },
80 { true, ui::VKEY_8, ui::EF_ALT_DOWN, SELECT_WIN_7 }, 84 { true, ui::VKEY_8, ui::EF_ALT_DOWN, SELECT_WIN_7 },
81 { true, ui::VKEY_9, ui::EF_ALT_DOWN, SELECT_LAST_WIN }, 85 { true, ui::VKEY_9, ui::EF_ALT_DOWN, SELECT_LAST_WIN },
82 86
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 arraysize(kActionsAllowedAtLoginOrLockScreen); 157 arraysize(kActionsAllowedAtLoginOrLockScreen);
154 158
155 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 159 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
156 EXIT, 160 EXIT,
157 }; 161 };
158 162
159 const size_t kActionsAllowedAtLockScreenLength = 163 const size_t kActionsAllowedAtLockScreenLength =
160 arraysize(kActionsAllowedAtLockScreen); 164 arraysize(kActionsAllowedAtLockScreen);
161 165
162 } // namespace ash 166 } // 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