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

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

Issue 594063: Plumb shift-reload down into newly-added shift-reload API. (Closed)
Patch Set: 80 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
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 { 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,
124 GdkModifierType(GDK_CONTROL_MASK|GDK_SHIFT_MASK) },
Evan Stade 2010/02/18 17:11:04 nit: spaces around |
123 { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, 125 { GDK_F5, IDC_RELOAD, GdkModifierType(0) },
124 { GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK }, 126 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_SHIFT_MASK },
125 { GDK_F5, IDC_RELOAD, GDK_SHIFT_MASK },
126 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, 127 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) },
127 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, 128 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) },
128 129
129 // Dev tools. 130 // Dev tools.
130 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK }, 131 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK },
131 { GDK_i, IDC_DEV_TOOLS, 132 { GDK_i, IDC_DEV_TOOLS,
132 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 133 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
133 { GDK_j, IDC_DEV_TOOLS_CONSOLE, 134 { GDK_j, IDC_DEV_TOOLS_CONSOLE,
134 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 135 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
135 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK }, 136 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK },
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( 185 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand(
185 int command_id) { 186 int command_id) {
186 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter = 187 base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter =
187 primary_accelerators_.find(command_id); 188 primary_accelerators_.find(command_id);
188 189
189 if (iter == primary_accelerators_.end()) 190 if (iter == primary_accelerators_.end())
190 return NULL; 191 return NULL;
191 192
192 return &iter->second; 193 return &iter->second;
193 } 194 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698