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

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

Issue 7721001: PrintPreview: Make ctrl-shift-p start the native print flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + merge conflicts fix Created 9 years, 4 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) 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_gtk.h" 5 #include "chrome/browser/ui/views/accelerator_table_gtk.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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #endif 88 #endif
89 { ui::VKEY_I, true, true, false, IDC_DEV_TOOLS }, 89 { ui::VKEY_I, true, true, false, IDC_DEV_TOOLS },
90 { ui::VKEY_F12, false, false, false, IDC_DEV_TOOLS }, 90 { ui::VKEY_F12, false, false, false, IDC_DEV_TOOLS },
91 { ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE }, 91 { ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE },
92 { ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT }, 92 { ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT },
93 { ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW }, 93 { ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW },
94 { ui::VKEY_T, false, true, false, IDC_NEW_TAB }, 94 { ui::VKEY_T, false, true, false, IDC_NEW_TAB },
95 { ui::VKEY_N, false, true, false, IDC_NEW_WINDOW }, 95 { ui::VKEY_N, false, true, false, IDC_NEW_WINDOW },
96 { ui::VKEY_O, false, true, false, IDC_OPEN_FILE }, 96 { ui::VKEY_O, false, true, false, IDC_OPEN_FILE },
97 { ui::VKEY_P, false, true, false, IDC_PRINT}, 97 { ui::VKEY_P, false, true, false, IDC_PRINT},
98 { ui::VKEY_P, true, true, false, IDC_ADVANCED_PRINT},
98 { ui::VKEY_R, false, true, false, IDC_RELOAD }, 99 { ui::VKEY_R, false, true, false, IDC_RELOAD },
99 { ui::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE }, 100 { ui::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE },
100 #if !defined(OS_CHROMEOS) 101 #if !defined(OS_CHROMEOS)
101 { ui::VKEY_F5, false, false, false, IDC_RELOAD }, 102 { ui::VKEY_F5, false, false, false, IDC_RELOAD },
102 { ui::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE }, 103 { ui::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE },
103 { ui::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE }, 104 { ui::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE },
104 #else 105 #else
105 { ui::VKEY_F3, false, false, false, IDC_RELOAD }, 106 { ui::VKEY_F3, false, false, false, IDC_RELOAD },
106 { ui::VKEY_F3, false, true, false, IDC_RELOAD_IGNORING_CACHE }, 107 { ui::VKEY_F3, false, true, false, IDC_RELOAD_IGNORING_CACHE },
107 { ui::VKEY_F3, true, false, false, IDC_RELOAD_IGNORING_CACHE }, 108 { ui::VKEY_F3, true, false, false, IDC_RELOAD_IGNORING_CACHE },
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL }, 151 { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
151 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL }, 152 { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
152 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS }, 153 { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
153 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS }, 154 { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
154 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS }, 155 { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
155 }; 156 };
156 157
157 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap); 158 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
158 159
159 } // namespace browser 160 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698