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

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

Issue 6792049: DevTools: open devtools upon F12 on Windows and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added missing shortcut registration. Created 9 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/chrome_dll.rc ('k') | chrome/browser/ui/views/accelerator_table_gtk.cc » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/gtk/accelerators_gtk.h" 5 #include "chrome/browser/ui/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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, 126 { GDK_F5, IDC_RELOAD, GdkModifierType(0) },
127 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_CONTROL_MASK }, 127 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_CONTROL_MASK },
128 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_SHIFT_MASK }, 128 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_SHIFT_MASK },
129 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, 129 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) },
130 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, 130 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) },
131 131
132 // Dev tools. 132 // Dev tools.
133 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK }, 133 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK },
134 { GDK_i, IDC_DEV_TOOLS, 134 { GDK_i, IDC_DEV_TOOLS,
135 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 135 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
136 { GDK_F12, IDC_DEV_TOOLS, GdkModifierType(0) },
136 { GDK_j, IDC_DEV_TOOLS_CONSOLE, 137 { GDK_j, IDC_DEV_TOOLS_CONSOLE,
137 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 138 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
138 { GDK_c, IDC_DEV_TOOLS_INSPECT, 139 { GDK_c, IDC_DEV_TOOLS_INSPECT,
139 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 140 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
140 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK }, 141 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK },
141 142
142 // Editing. 143 // Editing.
143 { GDK_c, IDC_COPY, GDK_CONTROL_MASK }, 144 { GDK_c, IDC_COPY, GDK_CONTROL_MASK },
144 { GDK_x, IDC_CUT, GDK_CONTROL_MASK }, 145 { GDK_x, IDC_CUT, GDK_CONTROL_MASK },
145 { GDK_v, IDC_PASTE, GDK_CONTROL_MASK }, 146 { GDK_v, IDC_PASTE, GDK_CONTROL_MASK },
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 const ui::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand( 200 const ui::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand(
200 int command_id) { 201 int command_id) {
201 base::hash_map<int, ui::AcceleratorGtk>::const_iterator iter = 202 base::hash_map<int, ui::AcceleratorGtk>::const_iterator iter =
202 primary_accelerators_.find(command_id); 203 primary_accelerators_.find(command_id);
203 204
204 if (iter == primary_accelerators_.end()) 205 if (iter == primary_accelerators_.end())
205 return NULL; 206 return NULL;
206 207
207 return &iter->second; 208 return &iter->second;
208 } 209 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_dll.rc ('k') | chrome/browser/ui/views/accelerator_table_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698