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

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

Issue 10698115: Support "Report Issue" in case of no-browser windows in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
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 #include "ui/base/events.h" 8 #include "ui/base/events.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, 44 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
45 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
46 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, 46 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN },
47 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, 47 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP },
48 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, 48 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE },
49 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, 49 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN },
50 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG }, 50 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG },
51 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB }, 51 { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB },
52 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, 52 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
53 #endif 53 #endif
54 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE },
54 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, 55 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
55 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 56 { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
56 TOGGLE_SPOKEN_FEEDBACK }, 57 TOGGLE_SPOKEN_FEEDBACK },
57 58
58 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or 59 // When you change the shortcuts for NEW_INCOGNITO_WINDOW, NEW_WINDOW, or
59 // NEW_TAB, you also need to modify 60 // NEW_TAB, you also need to modify
60 // ToolbarView::GetAcceleratorForCommandId() in 61 // ToolbarView::GetAcceleratorForCommandId() in
61 // chrome/browser/ui/views/toolbar_view.cc. 62 // chrome/browser/ui/views/toolbar_view.cc.
62 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 63 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
63 NEW_INCOGNITO_WINDOW }, 64 NEW_INCOGNITO_WINDOW },
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 arraysize(kActionsAllowedAtLoginOrLockScreen); 176 arraysize(kActionsAllowedAtLoginOrLockScreen);
176 177
177 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 178 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
178 EXIT, 179 EXIT,
179 }; 180 };
180 181
181 const size_t kActionsAllowedAtLockScreenLength = 182 const size_t kActionsAllowedAtLockScreenLength =
182 arraysize(kActionsAllowedAtLockScreen); 183 arraysize(kActionsAllowedAtLockScreen);
183 184
184 } // namespace ash 185 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698