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

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

Issue 11035051: Screen Magnifier: Change keyboard shortcut from [CTRL + brightness] to [CTRL + ALT + brightness] (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 { false, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR_RELEASED }, 58 { false, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR_RELEASED },
59 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR_PRESSED }, 59 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR_PRESSED },
60 { false, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR_RELEASED }, 60 { false, ui::VKEY_F5, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_LINEAR_RELEASED },
61 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, 61 { true, ui::VKEY_F5, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT },
62 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 62 { true, ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
63 TAKE_PARTIAL_SCREENSHOT }, 63 TAKE_PARTIAL_SCREENSHOT },
64 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN }, 64 { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN },
65 { true, ui::VKEY_F6, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN }, 65 { true, ui::VKEY_F6, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN },
66 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP }, 66 { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP },
67 { true, ui::VKEY_F7, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP }, 67 { true, ui::VKEY_F7, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP },
68 { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_OUT}, 68 { true, ui::VKEY_F6, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
69 { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, 69 MAGNIFY_SCREEN_ZOOM_OUT},
70 { true, ui::VKEY_F7, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
71 MAGNIFY_SCREEN_ZOOM_IN},
70 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, 72 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN },
71 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE }, 73 { true, ui::VKEY_F8, ui::EF_NONE, VOLUME_MUTE },
72 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN }, 74 { true, ui::VKEY_F9, ui::EF_NONE, VOLUME_DOWN },
73 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, 75 { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP },
74 // F13 (which is also for locking screen) is handled directly in power 76 // F13 (which is also for locking screen) is handled directly in power
75 // manager. 77 // manager.
76 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, 78 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED },
77 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, 79 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED },
78 #if !defined(NDEBUG) 80 #if !defined(NDEBUG)
79 // Extra shortcut for debug build to activate lock screen on linux desktop. 81 // Extra shortcut for debug build to activate lock screen on linux desktop.
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 #if defined(OS_CHROMEOS) 286 #if defined(OS_CHROMEOS)
285 CYCLE_DISPLAY_MODE, 287 CYCLE_DISPLAY_MODE,
286 LOCK_SCREEN, 288 LOCK_SCREEN,
287 #endif 289 #endif
288 }; 290 };
289 291
290 const size_t kActionsAllowedAtModalWindowLength = 292 const size_t kActionsAllowedAtModalWindowLength =
291 arraysize(kActionsAllowedAtModalWindow); 293 arraysize(kActionsAllowedAtModalWindow);
292 294
293 } // namespace ash 295 } // 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