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

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

Issue 8341050: Aura: Support non-global keyboard shortcuts. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Restore native_widget_aura change Created 9 years, 1 month 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
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.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
11 namespace browser { 11 namespace browser {
12 12
13 // NOTE: Keep this list in the same (mostly-alphabetical) order as 13 // NOTE: Keep this list in the same (mostly-alphabetical) order as
14 // the Windows accelerators in ../../app/chrome_dll.rc. 14 // the Windows accelerators in ../../app/chrome_dll.rc.
15 const AcceleratorMapping kAcceleratorMap[] = { 15 const AcceleratorMapping kAcceleratorMap[] = {
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, 155 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
156 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, 156 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
157 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, 157 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
158 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, 158 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
159 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, 159 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
160 }; 160 };
161 161
162 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); 162 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
163 163
164 } // namespace browser 164 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_table.h ('k') | chrome/browser/ui/views/accelerator_table_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698