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

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

Issue 10377114: Remove some more OS_CHROMEOS from browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
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 // Do not use Ctrl-Alt as a shortcut modifier, as it is used by i18n keyboards: 15 // Do not use Ctrl-Alt as a shortcut modifier, as it is used by i18n keyboards:
16 // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/29/101121.aspx 16 // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/29/101121.aspx
17 const AcceleratorMapping kAcceleratorMap[] = { 17 const AcceleratorMapping kAcceleratorMap[] = {
18 // Keycode Shift Ctrl Alt Command ID 18 // Keycode Shift Ctrl Alt Command ID
19 { ui::VKEY_LEFT, false, false, true, IDC_BACK }, 19 { ui::VKEY_LEFT, false, false, true, IDC_BACK },
20 { ui::VKEY_BACK, false, false, false, IDC_BACK }, 20 { ui::VKEY_BACK, false, false, false, IDC_BACK },
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 { ui::VKEY_F1, false, false, false, IDC_BACK }, 22 { ui::VKEY_F1, false, false, false, IDC_BACK },
23 { ui::VKEY_OEM_2, false, true, true, IDC_SHOW_KEYBOARD_OVERLAY },
24 { ui::VKEY_OEM_2, true, true, true, IDC_SHOW_KEYBOARD_OVERLAY },
25 #endif 23 #endif
26 { ui::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE }, 24 { ui::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE },
27 { ui::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS }, 25 { ui::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS },
28 #if !defined(OS_CHROMEOS) 26 #if !defined(OS_CHROMEOS)
29 { ui::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA }, 27 { ui::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA },
30 #else 28 #else
31 { ui::VKEY_BACK, true, true, false, IDC_CLEAR_BROWSING_DATA }, 29 { ui::VKEY_BACK, true, true, false, IDC_CLEAR_BROWSING_DATA },
32 #endif 30 #endif
33 #if !defined(OS_CHROMEOS) 31 #if !defined(OS_CHROMEOS)
34 { ui::VKEY_F4, false, true, false, IDC_CLOSE_TAB }, 32 { ui::VKEY_F4, false, true, false, IDC_CLOSE_TAB },
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, 155 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
158 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, 156 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
159 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, 157 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
160 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, 158 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
161 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, 159 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
162 }; 160 };
163 161
164 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); 162 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
165 163
166 } // namespace browser 164 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698