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

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

Issue 9132004: Makes Ctrl-Shift-L work in AppList (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed accelerator_table 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
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/views/aura/chrome_shell_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 { ui::VKEY_F11, false, false, false, IDC_FULLSCREEN }, 81 { ui::VKEY_F11, false, false, false, IDC_FULLSCREEN },
82 #else 82 #else
83 { ui::VKEY_F4, false, false, false, IDC_FULLSCREEN }, 83 { ui::VKEY_F4, false, false, false, IDC_FULLSCREEN },
84 #endif 84 #endif
85 #if !defined(OS_CHROMEOS) 85 #if !defined(OS_CHROMEOS)
86 { ui::VKEY_F1, false, false, false, IDC_HELP_PAGE }, 86 { ui::VKEY_F1, false, false, false, IDC_HELP_PAGE },
87 #else 87 #else
88 { ui::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE }, 88 { ui::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE },
89 { ui::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE }, 89 { ui::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE },
90 #endif 90 #endif
91 #if defined(OS_CHROMEOS) 91 #if defined(OS_CHROMEOS) && !defined(USE_AURA)
92 { ui::VKEY_L, true, true, false, IDC_LOCK_SCREEN }, 92 { ui::VKEY_L, true, true, false, IDC_LOCK_SCREEN },
93 #endif 93 #endif
94 { ui::VKEY_I, true, true, false, IDC_DEV_TOOLS }, 94 { ui::VKEY_I, true, true, false, IDC_DEV_TOOLS },
95 { ui::VKEY_F12, false, false, false, IDC_DEV_TOOLS }, 95 { ui::VKEY_F12, false, false, false, IDC_DEV_TOOLS },
96 { ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE }, 96 { ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE },
97 { ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT }, 97 { ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT },
98 { ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW }, 98 { ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW },
99 { ui::VKEY_T, false, true, false, IDC_NEW_TAB }, 99 { ui::VKEY_T, false, true, false, IDC_NEW_TAB },
100 { ui::VKEY_N, false, true, false, IDC_NEW_WINDOW }, 100 { ui::VKEY_N, false, true, false, IDC_NEW_WINDOW },
101 { ui::VKEY_O, false, true, false, IDC_OPEN_FILE }, 101 { ui::VKEY_O, false, true, false, IDC_OPEN_FILE },
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, 160 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
161 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, 161 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
162 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, 162 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
163 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, 163 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
164 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, 164 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
165 }; 165 };
166 166
167 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); 167 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
168 168
169 } // namespace browser 169 } // namespace browser
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/views/aura/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698