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

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

Issue 11088053: Revert 160776 - Screen Magnifier: Change keyboard shortcut from [CTRL + brightness] to [CTRL + ALT … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP }, 115 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP },
116 { true, ui::VKEY_F7, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP }, 116 { true, ui::VKEY_F7, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP },
117 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE }, 117 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE },
118 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 118 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
119 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN }, 119 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN },
120 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 120 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
121 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, 121 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP },
122 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, 122 { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
123 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, 123 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER },
124 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY }, 124 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY },
125 { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 125 { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
126 MAGNIFY_SCREEN_ZOOM_IN}, 126 { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT},
127 { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
128 MAGNIFY_SCREEN_ZOOM_OUT},
129 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 127 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
130 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 128 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
131 SHOW_KEYBOARD_OVERLAY }, 129 SHOW_KEYBOARD_OVERLAY },
132 { true, ui::VKEY_OEM_2, 130 { true, ui::VKEY_OEM_2,
133 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 131 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
134 SHOW_KEYBOARD_OVERLAY }, 132 SHOW_KEYBOARD_OVERLAY },
135 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 133 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
136 { true, ui::VKEY_F1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK }, 134 { true, ui::VKEY_F1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK },
137 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER }, 135 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER },
138 { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 }, 136 { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 },
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 arraysize(kActionsAllowedAtLoginOrLockScreen); 247 arraysize(kActionsAllowedAtLoginOrLockScreen);
250 248
251 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 249 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
252 EXIT, 250 EXIT,
253 }; 251 };
254 252
255 const size_t kActionsAllowedAtLockScreenLength = 253 const size_t kActionsAllowedAtLockScreenLength =
256 arraysize(kActionsAllowedAtLockScreen); 254 arraysize(kActionsAllowedAtLockScreen);
257 255
258 } // namespace ash 256 } // 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