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

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

Issue 309293002: Changed keyboard shortcut for touch projector overlay from Ctrl-Shift-9 to Ctrl-Alt-P (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: List modifiers in alphabetical order Created 6 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
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/keyboard_overlay_data.js » ('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 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, 61 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED },
62 { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 62 { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
63 OPEN_FILE_MANAGER }, 63 OPEN_FILE_MANAGER },
64 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, 64 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
65 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 65 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
66 DISABLE_GPU_WATCHDOG }, 66 DISABLE_GPU_WATCHDOG },
67 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 67 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
68 TOUCH_HUD_MODE_CHANGE }, 68 TOUCH_HUD_MODE_CHANGE },
69 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, 69 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
70 TOUCH_HUD_CLEAR }, 70 TOUCH_HUD_CLEAR },
71 { true, ui::VKEY_9, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, 71 { true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
72 TOUCH_HUD_PROJECTION_TOGGLE }, 72 TOUCH_HUD_PROJECTION_TOGGLE },
73 // Accessibility: Spoken feedback shortcuts. The first one is to toggle 73 // Accessibility: Spoken feedback shortcuts. The first one is to toggle
74 // spoken feedback on or off. The others are only valid when 74 // spoken feedback on or off. The others are only valid when
75 // spoken feedback is enabled. 75 // spoken feedback is enabled.
76 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 76 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
77 TOGGLE_SPOKEN_FEEDBACK }, 77 TOGGLE_SPOKEN_FEEDBACK },
78 { true, ui::VKEY_CONTROL, ui::EF_CONTROL_DOWN, SILENCE_SPOKEN_FEEDBACK}, 78 { true, ui::VKEY_CONTROL, ui::EF_CONTROL_DOWN, SILENCE_SPOKEN_FEEDBACK},
79 { true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 79 { true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
80 SWITCH_TO_PREVIOUS_USER }, 80 SWITCH_TO_PREVIOUS_USER },
81 { true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 81 { true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 WINDOW_MINIMIZE, 429 WINDOW_MINIMIZE,
430 TOGGLE_FULLSCREEN, 430 TOGGLE_FULLSCREEN,
431 TOGGLE_MAXIMIZED, 431 TOGGLE_MAXIMIZED,
432 WINDOW_POSITION_CENTER, 432 WINDOW_POSITION_CENTER,
433 ROTATE_WINDOW, 433 ROTATE_WINDOW,
434 }; 434 };
435 435
436 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow); 436 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow);
437 437
438 } // namespace ash 438 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/keyboard_overlay_data.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698