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

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: Don't remove Exit menu item from non win-ash platforms. Created 7 years, 9 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_DIALOG }, 81 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG },
82 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 82 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
83 OPEN_FILE_MANAGER }, 83 OPEN_FILE_MANAGER },
84 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, 84 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
85 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 85 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
86 DISABLE_GPU_WATCHDOG }, 86 DISABLE_GPU_WATCHDOG },
87 #endif // defined(OS_CHROMEOS) 87 #endif // defined(OS_CHROMEOS)
88 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, 88 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE },
89 #if !defined(OS_WIN)
89 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, 90 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
91 #endif
90 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 92 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
91 TOGGLE_SPOKEN_FEEDBACK }, 93 TOGGLE_SPOKEN_FEEDBACK },
92 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 94 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
93 TOUCH_HUD_MODE_CHANGE }, 95 TOUCH_HUD_MODE_CHANGE },
94 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, 96 { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
95 TOUCH_HUD_CLEAR }, 97 TOUCH_HUD_CLEAR },
96 98
97 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or 99 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or
98 // NEW_TAB, you also need to modify 100 // NEW_TAB, you also need to modify
99 // ToolbarView::GetAcceleratorForCommandId() in 101 // ToolbarView::GetAcceleratorForCommandId() in
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 CYCLE_FORWARD_LINEAR, 296 CYCLE_FORWARD_LINEAR,
295 CYCLE_FORWARD_MRU, 297 CYCLE_FORWARD_MRU,
296 TOGGLE_MAXIMIZED, 298 TOGGLE_MAXIMIZED,
297 WINDOW_MINIMIZE, 299 WINDOW_MINIMIZE,
298 }; 300 };
299 301
300 const size_t kNonrepeatableActionsLength = 302 const size_t kNonrepeatableActionsLength =
301 arraysize(kNonrepeatableActions); 303 arraysize(kNonrepeatableActions);
302 304
303 } // namespace ash 305 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698