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

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

Issue 17063013: Separate projection mode from rest of touch HUD (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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 | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG }, 67 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG },
68 { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 68 { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
69 OPEN_FILE_MANAGER }, 69 OPEN_FILE_MANAGER },
70 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, 70 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
71 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 71 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
72 DISABLE_GPU_WATCHDOG }, 72 DISABLE_GPU_WATCHDOG },
73 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 73 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
74 TOUCH_HUD_MODE_CHANGE }, 74 TOUCH_HUD_MODE_CHANGE },
75 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, 75 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
76 TOUCH_HUD_CLEAR }, 76 TOUCH_HUD_CLEAR },
77 { true, ui::VKEY_9, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
78 TOUCH_HUD_PROJECTION_TOGGLE },
77 // Accessibility: Spoken feedback shortcuts. The first one is to toggle 79 // Accessibility: Spoken feedback shortcuts. The first one is to toggle
78 // spoken feedback on or off. The others are only valid when 80 // spoken feedback on or off. The others are only valid when
79 // spoken feedback is enabled. 81 // spoken feedback is enabled.
80 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 82 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
81 TOGGLE_SPOKEN_FEEDBACK }, 83 TOGGLE_SPOKEN_FEEDBACK },
82 { true, ui::VKEY_CONTROL, ui::EF_CONTROL_DOWN, SILENCE_SPOKEN_FEEDBACK}, 84 { true, ui::VKEY_CONTROL, ui::EF_CONTROL_DOWN, SILENCE_SPOKEN_FEEDBACK},
83 #endif // defined(OS_CHROMEOS) 85 #endif // defined(OS_CHROMEOS)
84 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, 86 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE },
85 #if !defined(OS_WIN) 87 #if !defined(OS_WIN)
86 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, 88 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 ADD_REMOVE_DISPLAY, 403 ADD_REMOVE_DISPLAY,
402 DISABLE_GPU_WATCHDOG, 404 DISABLE_GPU_WATCHDOG,
403 TOGGLE_MIRROR_MODE, 405 TOGGLE_MIRROR_MODE,
404 #endif // defined(OS_CHROMEOS) 406 #endif // defined(OS_CHROMEOS)
405 }; 407 };
406 408
407 const size_t kActionsAllowedInAppModeLength = 409 const size_t kActionsAllowedInAppModeLength =
408 arraysize(kActionsAllowedInAppMode); 410 arraysize(kActionsAllowedInAppMode);
409 411
410 } // namespace ash 412 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698