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

Side by Side Diff: chrome/browser/gtk/accelerators_gtk.cc

Issue 565050: gtk: Remove Backspace and Shift-Backspace accelerators. (Closed)
Patch Set: Created 10 years, 10 months 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
« 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) 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 { GDK_g, IDC_FIND_PREVIOUS, 109 { GDK_g, IDC_FIND_PREVIOUS,
110 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 110 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
111 { GDK_F3, IDC_FIND_PREVIOUS, GDK_SHIFT_MASK }, 111 { GDK_F3, IDC_FIND_PREVIOUS, GDK_SHIFT_MASK },
112 112
113 // Navigation / toolbar buttons. 113 // Navigation / toolbar buttons.
114 { GDK_Home, IDC_HOME, GDK_MOD1_MASK }, 114 { GDK_Home, IDC_HOME, GDK_MOD1_MASK },
115 { XF86XK_HomePage, IDC_HOME, GdkModifierType(0) }, 115 { XF86XK_HomePage, IDC_HOME, GdkModifierType(0) },
116 { GDK_Escape, IDC_STOP, GdkModifierType(0) }, 116 { GDK_Escape, IDC_STOP, GdkModifierType(0) },
117 { XF86XK_Stop, IDC_STOP, GdkModifierType(0) }, 117 { XF86XK_Stop, IDC_STOP, GdkModifierType(0) },
118 { GDK_Left, IDC_BACK, GDK_MOD1_MASK }, 118 { GDK_Left, IDC_BACK, GDK_MOD1_MASK },
119 { GDK_BackSpace, IDC_BACK, GdkModifierType(0) },
120 { XF86XK_Back, IDC_BACK, GdkModifierType(0) }, 119 { XF86XK_Back, IDC_BACK, GdkModifierType(0) },
121 { GDK_Right, IDC_FORWARD, GDK_MOD1_MASK }, 120 { GDK_Right, IDC_FORWARD, GDK_MOD1_MASK },
122 { GDK_BackSpace, IDC_FORWARD, GDK_SHIFT_MASK },
123 { XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) }, 121 { XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) },
124 { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK }, 122 { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK },
125 { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, 123 { GDK_F5, IDC_RELOAD, GdkModifierType(0) },
126 { GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK }, 124 { GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK },
127 { GDK_F5, IDC_RELOAD, GDK_SHIFT_MASK }, 125 { GDK_F5, IDC_RELOAD, GDK_SHIFT_MASK },
128 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, 126 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) },
129 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, 127 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) },
130 128
131 // Dev tools. 129 // Dev tools.
132 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK }, 130 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK },
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( 184 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand(
187 int command_id) { 185 int command_id) {
188 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter = 186 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter =
189 primary_accelerators_.find(command_id); 187 primary_accelerators_.find(command_id);
190 188
191 if (iter == primary_accelerators_.end()) 189 if (iter == primary_accelerators_.end())
192 return NULL; 190 return NULL;
193 191
194 return &iter->second; 192 return &iter->second;
195 } 193 }
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