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

Side by Side Diff: chrome/browser/ui/views/accelerator_table.cc

Issue 9297008: [HTerm-Crosh] Add key shortcut for opening Crosh on ChromeOS Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for review.. Created 8 years, 11 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 "chrome/browser/ui/views/accelerator_table.h" 5 #include "chrome/browser/ui/views/accelerator_table.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "ui/base/keycodes/keyboard_codes.h" 9 #include "ui/base/keycodes/keyboard_codes.h"
10 10
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 { ui::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE }, 110 { ui::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE },
111 { ui::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE }, 111 { ui::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE },
112 #else 112 #else
113 { ui::VKEY_F3, false, false, false, IDC_RELOAD }, 113 { ui::VKEY_F3, false, false, false, IDC_RELOAD },
114 { ui::VKEY_F3, false, true, false, IDC_RELOAD_IGNORING_CACHE }, 114 { ui::VKEY_F3, false, true, false, IDC_RELOAD_IGNORING_CACHE },
115 { ui::VKEY_F3, true, false, false, IDC_RELOAD_IGNORING_CACHE }, 115 { ui::VKEY_F3, true, false, false, IDC_RELOAD_IGNORING_CACHE },
116 #endif 116 #endif
117 { ui::VKEY_HOME, false, false, true, IDC_HOME }, 117 { ui::VKEY_HOME, false, false, true, IDC_HOME },
118 { ui::VKEY_T, true, true, false, IDC_RESTORE_TAB }, 118 { ui::VKEY_T, true, true, false, IDC_RESTORE_TAB },
119 { ui::VKEY_S, false, true, false, IDC_SAVE_PAGE }, 119 { ui::VKEY_S, false, true, false, IDC_SAVE_PAGE },
120 #if defined(OS_CHROMEOS) && defined(USE_AURA)
121 { ui::VKEY_T, false, true, true, IDC_NEW_CROSH_TAB },
122 #endif
120 #if defined(OS_CHROMEOS) 123 #if defined(OS_CHROMEOS)
121 { ui::VKEY_M, false, true, false, IDC_FILE_MANAGER }, 124 { ui::VKEY_M, false, true, false, IDC_FILE_MANAGER },
122 { ui::VKEY_LWIN, false, false, false, IDC_SEARCH }, 125 { ui::VKEY_LWIN, false, false, false, IDC_SEARCH },
123 #endif 126 #endif
124 { ui::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB }, 127 { ui::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB },
125 { ui::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB }, 128 { ui::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB },
126 { ui::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB }, 129 { ui::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB },
127 { ui::VKEY_NEXT, false, true, false, IDC_SELECT_NEXT_TAB }, 130 { ui::VKEY_NEXT, false, true, false, IDC_SELECT_NEXT_TAB },
128 { ui::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB }, 131 { ui::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB },
129 { ui::VKEY_PRIOR, false, true, false, IDC_SELECT_PREVIOUS_TAB }, 132 { ui::VKEY_PRIOR, false, true, false, IDC_SELECT_PREVIOUS_TAB },
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, 165 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
163 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, 166 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
164 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, 167 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
165 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, 168 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
166 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, 169 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
167 }; 170 };
168 171
169 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); 172 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
170 173
171 } // namespace browser 174 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698