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

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

Issue 10917075: events: Move some files into ui/base/events/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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/events.h" 9 #include "ui/base/events/event_constants.h"
10 10
11 namespace chrome { 11 namespace chrome {
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 { ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK }, 18 { ui::VKEY_LEFT, ui::EF_ALT_DOWN, IDC_BACK },
19 { ui::VKEY_BACK, ui::EF_NONE, IDC_BACK }, 19 { ui::VKEY_BACK, ui::EF_NONE, IDC_BACK },
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 { ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW }, 143 { ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW },
144 { ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE }, 144 { ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE },
145 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB }, 145 { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB },
146 { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER }, 146 { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER },
147 #endif 147 #endif
148 }; 148 };
149 149
150 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); 150 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
151 151
152 } // namespace chrome 152 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_view_browsertest.cc ('k') | chrome/browser/ui/views/accelerator_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698