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

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

Issue 8356028: Add shortcut to show avatar menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_linux.h" 5 #include "chrome/browser/ui/views/accelerator_table_linux.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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 { ui::VKEY_7, false, true, false, IDC_SELECT_TAB_6 }, 135 { ui::VKEY_7, false, true, false, IDC_SELECT_TAB_6 },
136 { ui::VKEY_NUMPAD7, false, true, false, IDC_SELECT_TAB_6 }, 136 { ui::VKEY_NUMPAD7, false, true, false, IDC_SELECT_TAB_6 },
137 { ui::VKEY_8, false, true, false, IDC_SELECT_TAB_7 }, 137 { ui::VKEY_8, false, true, false, IDC_SELECT_TAB_7 },
138 { ui::VKEY_NUMPAD8, false, true, false, IDC_SELECT_TAB_7 }, 138 { ui::VKEY_NUMPAD8, false, true, false, IDC_SELECT_TAB_7 },
139 { ui::VKEY_B, true, true, false, IDC_SHOW_BOOKMARK_BAR }, 139 { ui::VKEY_B, true, true, false, IDC_SHOW_BOOKMARK_BAR },
140 { ui::VKEY_O, true, true, false, IDC_SHOW_BOOKMARK_MANAGER }, 140 { ui::VKEY_O, true, true, false, IDC_SHOW_BOOKMARK_MANAGER },
141 { ui::VKEY_J, false, true, false, IDC_SHOW_DOWNLOADS }, 141 { ui::VKEY_J, false, true, false, IDC_SHOW_DOWNLOADS },
142 { ui::VKEY_H, false, true, false, IDC_SHOW_HISTORY }, 142 { ui::VKEY_H, false, true, false, IDC_SHOW_HISTORY },
143 { ui::VKEY_F, false, false, true, IDC_SHOW_APP_MENU}, 143 { ui::VKEY_F, false, false, true, IDC_SHOW_APP_MENU},
144 { ui::VKEY_E, false, false, true, IDC_SHOW_APP_MENU}, 144 { ui::VKEY_E, false, false, true, IDC_SHOW_APP_MENU},
145 #if !defined(OS_CHROMEOS)
146 { ui::VKEY_M, true, true, false, IDC_SHOW_AVATAR_MENU},
147 #endif
145 { ui::VKEY_ESCAPE, false, false, false, IDC_STOP }, 148 { ui::VKEY_ESCAPE, false, false, false, IDC_STOP },
146 { ui::VKEY_ESCAPE, true, false, false, IDC_TASK_MANAGER }, 149 { ui::VKEY_ESCAPE, true, false, false, IDC_TASK_MANAGER },
147 { ui::VKEY_OEM_PERIOD, true, true, false, IDC_TOGGLE_SPEECH_INPUT }, 150 { ui::VKEY_OEM_PERIOD, true, true, false, IDC_TOGGLE_SPEECH_INPUT },
148 { ui::VKEY_U, false, true, false, IDC_VIEW_SOURCE }, 151 { ui::VKEY_U, false, true, false, IDC_VIEW_SOURCE },
149 { ui::VKEY_OEM_MINUS, false, true, false, IDC_ZOOM_MINUS }, 152 { ui::VKEY_OEM_MINUS, false, true, false, IDC_ZOOM_MINUS },
150 { ui::VKEY_OEM_MINUS, true, true, false, IDC_ZOOM_MINUS }, 153 { ui::VKEY_OEM_MINUS, true, true, false, IDC_ZOOM_MINUS },
151 { ui::VKEY_SUBTRACT, false, true, false, IDC_ZOOM_MINUS }, 154 { ui::VKEY_SUBTRACT, false, true, false, IDC_ZOOM_MINUS },
152 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, 155 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
153 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, 156 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
154 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, 157 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
155 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, 158 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
156 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, 159 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
157 }; 160 };
158 161
159 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); 162 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
160 163
161 } // namespace browser 164 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698