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

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

Issue 12330056: Remove the Exit menu item from the Wrench menu in Win/Ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update accelerator unit test. Created 7 years, 10 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
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // Extra shortcut to lock the screen on linux desktop. 77 // Extra shortcut to lock the screen on linux desktop.
78 { true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED }, 78 { true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED },
79 { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED }, 79 { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED },
80 #endif // !defined(NDEBUG) 80 #endif // !defined(NDEBUG)
81 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, 81 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG },
82 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, 82 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
83 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 83 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
84 DISABLE_GPU_WATCHDOG }, 84 DISABLE_GPU_WATCHDOG },
85 #endif // defined(OS_CHROMEOS) 85 #endif // defined(OS_CHROMEOS)
86 { 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 },
87 #if !defined(OS_WIN)
87 { 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 },
89 #endif
88 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 90 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
89 TOGGLE_SPOKEN_FEEDBACK }, 91 TOGGLE_SPOKEN_FEEDBACK },
90 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 92 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
91 TOUCH_HUD_MODE_CHANGE }, 93 TOUCH_HUD_MODE_CHANGE },
92 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, 94 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
93 TOUCH_HUD_CLEAR }, 95 TOUCH_HUD_CLEAR },
94 96
95 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or 97 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or
96 // NEW_TAB, you also need to modify 98 // NEW_TAB, you also need to modify
97 // ToolbarView::GetAcceleratorForCommandId() in 99 // ToolbarView::GetAcceleratorForCommandId() in
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 CYCLE_FORWARD_LINEAR, 294 CYCLE_FORWARD_LINEAR,
293 CYCLE_FORWARD_MRU, 295 CYCLE_FORWARD_MRU,
294 TOGGLE_MAXIMIZED, 296 TOGGLE_MAXIMIZED,
295 WINDOW_MINIMIZE, 297 WINDOW_MINIMIZE,
296 }; 298 };
297 299
298 const size_t kNonrepeatableActionsLength = 300 const size_t kNonrepeatableActionsLength =
299 arraysize(kNonrepeatableActions); 301 arraysize(kNonrepeatableActions);
300 302
301 } // namespace ash 303 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698