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

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

Issue 70183009: linux_aura: Linux allows both Ctrl and Alt to select numbered tabs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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) 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 { ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ADVANCED_PRINT}, 51 { ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ADVANCED_PRINT},
52 { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD }, 52 { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD },
53 { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 53 { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
54 IDC_RELOAD_IGNORING_CACHE }, 54 IDC_RELOAD_IGNORING_CACHE },
55 { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME }, 55 { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME },
56 { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE }, 56 { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE },
57 { ui::VKEY_9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB }, 57 { ui::VKEY_9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB },
58 { ui::VKEY_NUMPAD9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB }, 58 { ui::VKEY_NUMPAD9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB },
59 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
60 { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB },
61 { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB },
62 #endif
59 { ui::VKEY_TAB, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, 63 { ui::VKEY_TAB, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB },
60 { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB }, 64 { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN, IDC_SELECT_NEXT_TAB },
61 { ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 65 { ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
62 IDC_SELECT_PREVIOUS_TAB }, 66 IDC_SELECT_PREVIOUS_TAB },
63 { ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN, IDC_SELECT_PREVIOUS_TAB }, 67 { ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN, IDC_SELECT_PREVIOUS_TAB },
64 { ui::VKEY_1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0 }, 68 { ui::VKEY_1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0 },
65 { ui::VKEY_NUMPAD1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0 }, 69 { ui::VKEY_NUMPAD1, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_0 },
66 { ui::VKEY_2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1 }, 70 { ui::VKEY_2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1 },
67 { ui::VKEY_NUMPAD2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1 }, 71 { ui::VKEY_NUMPAD2, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_1 },
68 { ui::VKEY_3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2 }, 72 { ui::VKEY_3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2 },
69 { ui::VKEY_NUMPAD3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2 }, 73 { ui::VKEY_NUMPAD3, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_2 },
70 { ui::VKEY_4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3 }, 74 { ui::VKEY_4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3 },
71 { ui::VKEY_NUMPAD4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3 }, 75 { ui::VKEY_NUMPAD4, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_3 },
72 { ui::VKEY_5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4 }, 76 { ui::VKEY_5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4 },
73 { ui::VKEY_NUMPAD5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4 }, 77 { ui::VKEY_NUMPAD5, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_4 },
74 { ui::VKEY_6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5 }, 78 { ui::VKEY_6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5 },
75 { ui::VKEY_NUMPAD6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5 }, 79 { ui::VKEY_NUMPAD6, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_5 },
76 { ui::VKEY_7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6 }, 80 { ui::VKEY_7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6 },
77 { ui::VKEY_NUMPAD7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6 }, 81 { ui::VKEY_NUMPAD7, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_6 },
78 { ui::VKEY_8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7 }, 82 { ui::VKEY_8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7 },
79 { ui::VKEY_NUMPAD8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7 }, 83 { ui::VKEY_NUMPAD8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7 },
84 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
85 { ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 },
86 { ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 },
87 { ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 },
88 { ui::VKEY_NUMPAD2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 },
89 { ui::VKEY_3, ui::EF_ALT_DOWN, IDC_SELECT_TAB_2 },
90 { ui::VKEY_NUMPAD3, ui::EF_ALT_DOWN, IDC_SELECT_TAB_2 },
91 { ui::VKEY_4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3 },
92 { ui::VKEY_NUMPAD4, ui::EF_ALT_DOWN, IDC_SELECT_TAB_3 },
93 { ui::VKEY_5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 },
94 { ui::VKEY_NUMPAD5, ui::EF_ALT_DOWN, IDC_SELECT_TAB_4 },
95 { ui::VKEY_6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 },
96 { ui::VKEY_NUMPAD6, ui::EF_ALT_DOWN, IDC_SELECT_TAB_5 },
97 { ui::VKEY_7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 },
98 { ui::VKEY_NUMPAD7, ui::EF_ALT_DOWN, IDC_SELECT_TAB_6 },
99 { ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 },
100 { ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7 },
101 #endif
80 { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 102 { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
81 IDC_SHOW_BOOKMARK_BAR }, 103 IDC_SHOW_BOOKMARK_BAR },
82 { ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 104 { ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
83 IDC_SHOW_BOOKMARK_MANAGER }, 105 IDC_SHOW_BOOKMARK_MANAGER },
84 { ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS }, 106 { ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS },
85 { ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY }, 107 { ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY },
86 { ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, 108 { ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU},
87 { ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU}, 109 { ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU},
88 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, 110 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP },
89 { ui::VKEY_OEM_PERIOD, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 111 { ui::VKEY_OEM_PERIOD, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN); 244 *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN);
223 return true; 245 return true;
224 case IDC_PASTE: 246 case IDC_PASTE:
225 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN); 247 *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN);
226 return true; 248 return true;
227 } 249 }
228 return false; 250 return false;
229 } 251 }
230 252
231 } // namespace chrome 253 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698