| 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 { GDK_x, IDC_CUT, GDK_CONTROL_MASK }, | 140 { GDK_x, IDC_CUT, GDK_CONTROL_MASK }, |
| 141 { GDK_v, IDC_PASTE, GDK_CONTROL_MASK }, | 141 { GDK_v, IDC_PASTE, GDK_CONTROL_MASK }, |
| 142 | 142 |
| 143 // Miscellany. | 143 // Miscellany. |
| 144 { GDK_d, IDC_BOOKMARK_ALL_TABS, | 144 { GDK_d, IDC_BOOKMARK_ALL_TABS, |
| 145 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 145 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
| 146 { GDK_d, IDC_BOOKMARK_PAGE, GDK_CONTROL_MASK }, | 146 { GDK_d, IDC_BOOKMARK_PAGE, GDK_CONTROL_MASK }, |
| 147 { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK }, | 147 { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK }, |
| 148 { GDK_f, IDC_FIND, GDK_CONTROL_MASK }, | 148 { GDK_f, IDC_FIND, GDK_CONTROL_MASK }, |
| 149 { GDK_p, IDC_PRINT, GDK_CONTROL_MASK }, | 149 { GDK_p, IDC_PRINT, GDK_CONTROL_MASK }, |
| 150 { GDK_b, IDC_SHOW_BOOKMARK_BAR, GDK_CONTROL_MASK }, | 150 { GDK_b, IDC_SHOW_BOOKMARK_BAR, |
| 151 { GDK_b, IDC_SHOW_BOOKMARK_MANAGER, | |
| 152 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 151 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
| 153 { GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) }, | 152 { GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) }, |
| 154 { GDK_Delete, IDC_CLEAR_BROWSING_DATA, | 153 { GDK_Delete, IDC_CLEAR_BROWSING_DATA, |
| 155 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 154 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
| 156 { GDK_h, IDC_SHOW_HISTORY, GDK_CONTROL_MASK }, | 155 { GDK_h, IDC_SHOW_HISTORY, GDK_CONTROL_MASK }, |
| 157 { GDK_j, IDC_SHOW_DOWNLOADS, GDK_CONTROL_MASK }, | 156 { GDK_j, IDC_SHOW_DOWNLOADS, GDK_CONTROL_MASK }, |
| 158 { GDK_F1, IDC_HELP_PAGE, GdkModifierType(0) }, | 157 { GDK_F1, IDC_HELP_PAGE, GdkModifierType(0) }, |
| 159 { XF86XK_AddFavorite, IDC_BOOKMARK_PAGE, GdkModifierType(0) }, | 158 { XF86XK_AddFavorite, IDC_BOOKMARK_PAGE, GdkModifierType(0) }, |
| 160 { XF86XK_Favorites, IDC_SHOW_BOOKMARK_BAR, GdkModifierType(0) }, | 159 { XF86XK_Favorites, IDC_SHOW_BOOKMARK_BAR, GdkModifierType(0) }, |
| 161 { XF86XK_History, IDC_SHOW_HISTORY, GdkModifierType(0) }, | 160 { XF86XK_History, IDC_SHOW_HISTORY, GdkModifierType(0) }, |
| (...skipping 23 matching lines...) Expand all Loading... |
| 185 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( | 184 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( |
| 186 int command_id) { | 185 int command_id) { |
| 187 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter = | 186 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter = |
| 188 primary_accelerators_.find(command_id); | 187 primary_accelerators_.find(command_id); |
| 189 | 188 |
| 190 if (iter == primary_accelerators_.end()) | 189 if (iter == primary_accelerators_.end()) |
| 191 return NULL; | 190 return NULL; |
| 192 | 191 |
| 193 return &iter->second; | 192 return &iter->second; |
| 194 } | 193 } |
| OLD | NEW |