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

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

Issue 10735035: Support F3 and F4 keys on an Apple keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | « no previous file | no next file » | 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 24 matching lines...) Expand all
35 { true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME }, 35 { true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME },
36 { true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME }, 36 { true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME },
37 // Shortcut for Koren IME. 37 // Shortcut for Koren IME.
38 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME }, 38 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME },
39 39
40 { true, ui::VKEY_TAB, 40 { true, ui::VKEY_TAB,
41 ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, 41 ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
42 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 42 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
43 CYCLE_BACKWARD_MRU }, 43 CYCLE_BACKWARD_MRU },
44 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, 44 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
45 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
45 #if defined(OS_CHROMEOS) 46 #if defined(OS_CHROMEOS)
46 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, 47 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN },
47 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, 48 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP },
48 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, 49 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE },
49 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, 50 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN },
50 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, 51 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG },
51 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, 52 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB },
52 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, 53 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
53 #endif 54 #endif
54 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, 55 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
55 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 56 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
56 TOGGLE_SPOKEN_FEEDBACK }, 57 TOGGLE_SPOKEN_FEEDBACK },
57 58
58 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or 59 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or
59 // NEW_TAB, you also need to modify 60 // NEW_TAB, you also need to modify
60 // ToolbarView::GetAcceleratorForCommandId() in 61 // ToolbarView::GetAcceleratorForCommandId() in
61 // chrome/browser/ui/views/toolbar_view.cc. 62 // chrome/browser/ui/views/toolbar_view.cc.
62 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 63 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
63 NEW_INCOGNITO_WINDOW }, 64 NEW_INCOGNITO_WINDOW },
64 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW }, 65 { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW },
65 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB }, 66 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB },
66 67
67 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR }, 68 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR },
69 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN,
70 CYCLE_BACKWARD_LINEAR },
68 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, 71 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB },
69 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, 72 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT },
70 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 73 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
71 TAKE_PARTIAL_SCREENSHOT }, 74 TAKE_PARTIAL_SCREENSHOT },
72 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, 75 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
73 // On Chrome OS, Search key is mapped to LWIN. 76 // On Chrome OS, Search key is mapped to LWIN.
74 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, 77 { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
78 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_APP_LIST },
75 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST }, 79 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST },
76 { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK }, 80 { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK },
77 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN }, 81 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN },
78 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP }, 82 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP },
79 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE }, 83 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE },
80 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 84 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
81 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN }, 85 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN },
82 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 86 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
83 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, 87 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP },
84 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, 88 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 arraysize(kActionsAllowedAtLoginOrLockScreen); 179 arraysize(kActionsAllowedAtLoginOrLockScreen);
176 180
177 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 181 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
178 EXIT, 182 EXIT,
179 }; 183 };
180 184
181 const size_t kActionsAllowedAtLockScreenLength = 185 const size_t kActionsAllowedAtLockScreenLength =
182 arraysize(kActionsAllowedAtLockScreen); 186 arraysize(kActionsAllowedAtLockScreen);
183 187
184 } // namespace ash 188 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698