| 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 { XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) }, | 123 { XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) }, |
| 124 { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK }, | 124 { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK }, |
| 125 { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, | 125 { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, |
| 126 { GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK }, | 126 { GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK }, |
| 127 { GDK_F5, IDC_RELOAD, GDK_SHIFT_MASK }, | 127 { GDK_F5, IDC_RELOAD, GDK_SHIFT_MASK }, |
| 128 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, | 128 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, |
| 129 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, | 129 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, |
| 130 | 130 |
| 131 // Dev tools. | 131 // Dev tools. |
| 132 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK }, | 132 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK }, |
| 133 { GDK_i, IDC_DEV_TOOLS, GDK_CONTROL_MASK }, | 133 { GDK_i, IDC_DEV_TOOLS, |
| 134 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
| 134 { GDK_j, IDC_DEV_TOOLS_CONSOLE, | 135 { GDK_j, IDC_DEV_TOOLS_CONSOLE, |
| 135 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 136 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
| 136 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK }, | 137 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK }, |
| 137 | 138 |
| 138 // Editing. | 139 // Editing. |
| 139 { GDK_c, IDC_COPY, GDK_CONTROL_MASK }, | 140 { GDK_c, IDC_COPY, GDK_CONTROL_MASK }, |
| 140 { GDK_x, IDC_CUT, GDK_CONTROL_MASK }, | 141 { GDK_x, IDC_CUT, GDK_CONTROL_MASK }, |
| 141 { GDK_v, IDC_PASTE, GDK_CONTROL_MASK }, | 142 { GDK_v, IDC_PASTE, GDK_CONTROL_MASK }, |
| 142 | 143 |
| 143 // Miscellany. | 144 // Miscellany. |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( | 184 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( |
| 184 int command_id) { | 185 int command_id) { |
| 185 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter = | 186 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter = |
| 186 primary_accelerators_.find(command_id); | 187 primary_accelerators_.find(command_id); |
| 187 | 188 |
| 188 if (iter == primary_accelerators_.end()) | 189 if (iter == primary_accelerators_.end()) |
| 189 return NULL; | 190 return NULL; |
| 190 | 191 |
| 191 return &iter->second; | 192 return &iter->second; |
| 192 } | 193 } |
| OLD | NEW |