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

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

Issue 10177002: Do not include Ctrl+N and Ctrl+Shift+N in chrome/browser/ui/views/accelerator_table.cc when USE_ASH (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 8 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
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 { ui::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE }, 85 { ui::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE },
86 { ui::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE }, 86 { ui::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE },
87 #endif 87 #endif
88 { ui::VKEY_I, true, true, false, IDC_DEV_TOOLS }, 88 { ui::VKEY_I, true, true, false, IDC_DEV_TOOLS },
89 #if defined(OS_CHROMEOS) 89 #if defined(OS_CHROMEOS)
90 { ui::VKEY_I, true, false, true, IDC_FEEDBACK }, 90 { ui::VKEY_I, true, false, true, IDC_FEEDBACK },
91 #endif 91 #endif
92 { ui::VKEY_F12, false, false, false, IDC_DEV_TOOLS }, 92 { ui::VKEY_F12, false, false, false, IDC_DEV_TOOLS },
93 { ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE }, 93 { ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE },
94 { ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT }, 94 { ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT },
95 #if !defined(USE_ASH)
95 { ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW }, 96 { ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW },
97 #endif
96 { ui::VKEY_T, false, true, false, IDC_NEW_TAB }, 98 { ui::VKEY_T, false, true, false, IDC_NEW_TAB },
99 #if !defined(USE_ASH)
97 { ui::VKEY_N, false, true, false, IDC_NEW_WINDOW }, 100 { ui::VKEY_N, false, true, false, IDC_NEW_WINDOW },
101 #endif
98 { ui::VKEY_O, false, true, false, IDC_OPEN_FILE }, 102 { ui::VKEY_O, false, true, false, IDC_OPEN_FILE },
99 { ui::VKEY_P, false, true, false, IDC_PRINT}, 103 { ui::VKEY_P, false, true, false, IDC_PRINT},
100 { ui::VKEY_P, true, true, false, IDC_ADVANCED_PRINT}, 104 { ui::VKEY_P, true, true, false, IDC_ADVANCED_PRINT},
101 { ui::VKEY_R, false, true, false, IDC_RELOAD }, 105 { ui::VKEY_R, false, true, false, IDC_RELOAD },
102 { ui::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE }, 106 { ui::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE },
103 #if !defined(OS_CHROMEOS) 107 #if !defined(OS_CHROMEOS)
104 { ui::VKEY_F5, false, false, false, IDC_RELOAD }, 108 { ui::VKEY_F5, false, false, false, IDC_RELOAD },
105 { ui::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE }, 109 { ui::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE },
106 { ui::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE }, 110 { ui::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE },
107 #else 111 #else
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, 157 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
154 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, 158 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
155 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, 159 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
156 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, 160 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
157 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, 161 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
158 }; 162 };
159 163
160 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); 164 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
161 165
162 } // namespace browser 166 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_table.h ('k') | chrome/browser/ui/views/accelerator_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698