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

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

Issue 10155022: Add back accelerator labels for C-n and C-S-n to the wrench menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 8 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 16 matching lines...) Expand all
27 { true, ui::VKEY_TAB, true, false, true, CYCLE_BACKWARD_MRU }, 27 { true, ui::VKEY_TAB, true, false, true, CYCLE_BACKWARD_MRU },
28 { true, ui::VKEY_F5, false, false, false, CYCLE_FORWARD_LINEAR }, 28 { true, ui::VKEY_F5, false, false, false, CYCLE_FORWARD_LINEAR },
29 #if defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
30 { true, ui::VKEY_BRIGHTNESS_DOWN, false, false, false, BRIGHTNESS_DOWN }, 30 { true, ui::VKEY_BRIGHTNESS_DOWN, false, false, false, BRIGHTNESS_DOWN },
31 { true, ui::VKEY_BRIGHTNESS_UP, false, false, false, BRIGHTNESS_UP }, 31 { true, ui::VKEY_BRIGHTNESS_UP, false, false, false, BRIGHTNESS_UP },
32 { true, ui::VKEY_L, true, true, false, LOCK_SCREEN }, 32 { true, ui::VKEY_L, true, true, false, LOCK_SCREEN },
33 { true, ui::VKEY_M, false, true, false, OPEN_FILE_MANAGER }, 33 { true, ui::VKEY_M, false, true, false, OPEN_FILE_MANAGER },
34 { true, ui::VKEY_T, false, true, true, OPEN_CROSH }, 34 { true, ui::VKEY_T, false, true, true, OPEN_CROSH },
35 #endif 35 #endif
36 { true, ui::VKEY_Q, true, true, false, EXIT }, 36 { true, ui::VKEY_Q, true, true, false, EXIT },
37
38 // When you change the shortcut for NEW_INCOGNITO_WINDOW or NEW_WINDOW,
39 // you also need to modify ToolbarView::GetAcceleratorForCommandId() in
40 // chrome/browser/ui/views/toolbar_view.cc.
37 { true, ui::VKEY_N, true, true, false, NEW_INCOGNITO_WINDOW }, 41 { true, ui::VKEY_N, true, true, false, NEW_INCOGNITO_WINDOW },
38 { true, ui::VKEY_N, false, true, false, NEW_WINDOW }, 42 { true, ui::VKEY_N, false, true, false, NEW_WINDOW },
43
39 { true, ui::VKEY_F5, true, false, false, CYCLE_BACKWARD_LINEAR }, 44 { true, ui::VKEY_F5, true, false, false, CYCLE_BACKWARD_LINEAR },
40 { true, ui::VKEY_F5, false, true, false, TAKE_SCREENSHOT }, 45 { true, ui::VKEY_F5, false, true, false, TAKE_SCREENSHOT },
41 { true, ui::VKEY_F5, true, true, false, TAKE_PARTIAL_SCREENSHOT }, 46 { true, ui::VKEY_F5, true, true, false, TAKE_PARTIAL_SCREENSHOT },
42 { true, ui::VKEY_PRINT, false, false, false, TAKE_SCREENSHOT }, 47 { true, ui::VKEY_PRINT, false, false, false, TAKE_SCREENSHOT },
43 // On Chrome OS, Search key is mapped to LWIN. 48 // On Chrome OS, Search key is mapped to LWIN.
44 { true, ui::VKEY_LWIN, false, false, false, SEARCH_KEY }, 49 { true, ui::VKEY_LWIN, false, false, false, SEARCH_KEY },
45 { true, ui::VKEY_LWIN, true, false, false, TOGGLE_CAPS_LOCK }, 50 { true, ui::VKEY_LWIN, true, false, false, TOGGLE_CAPS_LOCK },
46 { true, ui::VKEY_F6, false, false, false, BRIGHTNESS_DOWN }, 51 { true, ui::VKEY_F6, false, false, false, BRIGHTNESS_DOWN },
47 { true, ui::VKEY_F7, false, false, false, BRIGHTNESS_UP }, 52 { true, ui::VKEY_F7, false, false, false, BRIGHTNESS_UP },
48 { true, ui::VKEY_F8, false, false, false, VOLUME_MUTE }, 53 { true, ui::VKEY_F8, false, false, false, VOLUME_MUTE },
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 PRINT_LAYER_HIERARCHY, 120 PRINT_LAYER_HIERARCHY,
116 PRINT_WINDOW_HIERARCHY, 121 PRINT_WINDOW_HIERARCHY,
117 ROTATE_SCREEN, 122 ROTATE_SCREEN,
118 #endif 123 #endif
119 }; 124 };
120 125
121 const size_t kActionsAllowedAtLoginScreenLength = 126 const size_t kActionsAllowedAtLoginScreenLength =
122 arraysize(kActionsAllowedAtLoginScreen); 127 arraysize(kActionsAllowedAtLoginScreen);
123 128
124 } // namespace ash 129 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar_view.cc » ('j') | chrome/browser/ui/views/toolbar_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698