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

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

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Nov 5 02:31:54 PST 2014 Created 6 years, 1 month 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
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/accelerators/accelerator.h" 9 #include "ui/base/accelerators/accelerator.h"
10 #include "ui/events/event_constants.h" 10 #include "ui/events/event_constants.h"
(...skipping 30 matching lines...) Expand all
41 { ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD }, 41 { ui::VKEY_RIGHT, ui::EF_ALT_DOWN, IDC_FORWARD },
42 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN, IDC_FORWARD }, 42 { ui::VKEY_BACK, ui::EF_SHIFT_DOWN, IDC_FORWARD },
43 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS }, 43 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS },
44 { ui::VKEY_F12, ui::EF_NONE, IDC_DEV_TOOLS_TOGGLE }, 44 { ui::VKEY_F12, ui::EF_NONE, IDC_DEV_TOOLS_TOGGLE },
45 { ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 45 { ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
46 IDC_DEV_TOOLS_CONSOLE }, 46 IDC_DEV_TOOLS_CONSOLE },
47 { ui::VKEY_C, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 47 { ui::VKEY_C, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
48 IDC_DEV_TOOLS_INSPECT }, 48 IDC_DEV_TOOLS_INSPECT },
49 { ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE }, 49 { ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE },
50 { ui::VKEY_P, ui::EF_CONTROL_DOWN, IDC_PRINT}, 50 { ui::VKEY_P, ui::EF_CONTROL_DOWN, IDC_PRINT},
51 #if !defined(DISABLE_BASIC_PRINTING) 51 #if defined(ENABLE_BASIC_PRINTING)
52 { ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_BASIC_PRINT}, 52 { ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_BASIC_PRINT},
53 #endif // !DISABLE_BASIC_PRINTING 53 #endif // ENABLE_BASIC_PRINTING
54 { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD }, 54 { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD },
55 { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 55 { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
56 IDC_RELOAD_IGNORING_CACHE }, 56 IDC_RELOAD_IGNORING_CACHE },
57 { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME }, 57 { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME },
58 { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE }, 58 { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE },
59 { ui::VKEY_9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB }, 59 { ui::VKEY_9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB },
60 { ui::VKEY_NUMPAD9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB }, 60 { ui::VKEY_NUMPAD9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB },
61 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 61 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
62 { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, 62 { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB },
63 { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, 63 { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB },
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); 252 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN);
253 return true; 253 return true;
254 case IDC_PASTE: 254 case IDC_PASTE:
255 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); 255 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN);
256 return true; 256 return true;
257 } 257 }
258 return false; 258 return false;
259 } 259 }
260 260
261 } // namespace chrome 261 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698