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

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

Issue 2876008: Make reload accelerators more consistent across platforms. (Closed)
Patch Set: merge Created 10 years, 5 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
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 { XF86XK_Back, IDC_BACK, GdkModifierType(0) }, 119 { XF86XK_Back, IDC_BACK, GdkModifierType(0) },
120 { GDK_Right, IDC_FORWARD, GDK_MOD1_MASK }, 120 { GDK_Right, IDC_FORWARD, GDK_MOD1_MASK },
121 { XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) }, 121 { XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) },
122 { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK }, 122 { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK },
123 { GDK_r, IDC_RELOAD_IGNORING_CACHE, 123 { GDK_r, IDC_RELOAD_IGNORING_CACHE,
124 GdkModifierType(GDK_CONTROL_MASK|GDK_SHIFT_MASK) }, 124 GdkModifierType(GDK_CONTROL_MASK|GDK_SHIFT_MASK) },
125 { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, 125 { GDK_F5, IDC_RELOAD, GdkModifierType(0) },
126 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_CONTROL_MASK },
126 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_SHIFT_MASK }, 127 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_SHIFT_MASK },
127 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, 128 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) },
128 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, 129 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) },
129 130
130 // Dev tools. 131 // Dev tools.
131 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK }, 132 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK },
132 { GDK_i, IDC_DEV_TOOLS, 133 { GDK_i, IDC_DEV_TOOLS,
133 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 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) },
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( 191 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand(
191 int command_id) { 192 int command_id) {
192 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter = 193 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter =
193 primary_accelerators_.find(command_id); 194 primary_accelerators_.find(command_id);
194 195
195 if (iter == primary_accelerators_.end()) 196 if (iter == primary_accelerators_.end())
196 return NULL; 197 return NULL;
197 198
198 return &iter->second; 199 return &iter->second;
199 } 200 }
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/browser_window_controller.mm ('k') | chrome/browser/gtk/reload_button_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698