OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/gtk/accelerators_gtk.h" | 5 #include "chrome/browser/gtk/accelerators_gtk.h" |
6 | 6 |
7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
8 #include <gdk/gdkkeysyms.h> | 8 #include <gdk/gdkkeysyms.h> |
9 #include <X11/XF86keysym.h> | 9 #include <X11/XF86keysym.h> |
10 | 10 |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 | 146 |
147 // Miscellany. | 147 // Miscellany. |
148 { GDK_d, IDC_BOOKMARK_ALL_TABS, | 148 { GDK_d, IDC_BOOKMARK_ALL_TABS, |
149 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 149 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
150 { GDK_d, IDC_BOOKMARK_PAGE, GDK_CONTROL_MASK }, | 150 { GDK_d, IDC_BOOKMARK_PAGE, GDK_CONTROL_MASK }, |
151 { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK }, | 151 { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK }, |
152 { GDK_f, IDC_FIND, GDK_CONTROL_MASK }, | 152 { GDK_f, IDC_FIND, GDK_CONTROL_MASK }, |
153 { GDK_p, IDC_PRINT, GDK_CONTROL_MASK }, | 153 { GDK_p, IDC_PRINT, GDK_CONTROL_MASK }, |
154 { GDK_b, IDC_SHOW_BOOKMARK_BAR, | 154 { GDK_b, IDC_SHOW_BOOKMARK_BAR, |
155 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 155 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
| 156 { GDK_b, IDC_SHOW_BOOKMARK_MANAGER, |
| 157 GdkModifierType(GDK_CONTROL_MASK | GDK_MOD1_MASK) }, |
156 { GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) }, | 158 { GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) }, |
157 { GDK_Delete, IDC_CLEAR_BROWSING_DATA, | 159 { GDK_Delete, IDC_CLEAR_BROWSING_DATA, |
158 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 160 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
159 { GDK_h, IDC_SHOW_HISTORY, GDK_CONTROL_MASK }, | 161 { GDK_h, IDC_SHOW_HISTORY, GDK_CONTROL_MASK }, |
160 { GDK_j, IDC_SHOW_DOWNLOADS, GDK_CONTROL_MASK }, | 162 { GDK_j, IDC_SHOW_DOWNLOADS, GDK_CONTROL_MASK }, |
161 { GDK_F1, IDC_HELP_PAGE, GdkModifierType(0) }, | 163 { GDK_F1, IDC_HELP_PAGE, GdkModifierType(0) }, |
162 { XF86XK_AddFavorite, IDC_BOOKMARK_PAGE, GdkModifierType(0) }, | 164 { XF86XK_AddFavorite, IDC_BOOKMARK_PAGE, GdkModifierType(0) }, |
163 { XF86XK_Favorites, IDC_SHOW_BOOKMARK_BAR, GdkModifierType(0) }, | 165 { XF86XK_Favorites, IDC_SHOW_BOOKMARK_BAR, GdkModifierType(0) }, |
164 { XF86XK_History, IDC_SHOW_HISTORY, GdkModifierType(0) }, | 166 { XF86XK_History, IDC_SHOW_HISTORY, GdkModifierType(0) }, |
165 { GDK_q, IDC_EXIT, GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 167 { GDK_q, IDC_EXIT, GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
(...skipping 22 matching lines...) Expand all Loading... |
188 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( | 190 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( |
189 int command_id) { | 191 int command_id) { |
190 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter = | 192 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter = |
191 primary_accelerators_.find(command_id); | 193 primary_accelerators_.find(command_id); |
192 | 194 |
193 if (iter == primary_accelerators_.end()) | 195 if (iter == primary_accelerators_.end()) |
194 return NULL; | 196 return NULL; |
195 | 197 |
196 return &iter->second; | 198 return &iter->second; |
197 } | 199 } |
OLD | NEW |