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

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

Issue 155103: Adds a couple of keybindings. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser.cc ('k') | 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/browser_window_gtk.h" 5 #include "chrome/browser/gtk/browser_window_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 #include <X11/XF86keysym.h> 8 #include <X11/XF86keysym.h>
9 9
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 // Miscellany. 212 // Miscellany.
213 { GDK_d, IDC_STAR, GDK_CONTROL_MASK }, 213 { GDK_d, IDC_STAR, GDK_CONTROL_MASK },
214 { XF86XK_AddFavorite, IDC_STAR, GdkModifierType(0) }, 214 { XF86XK_AddFavorite, IDC_STAR, GdkModifierType(0) },
215 { XF86XK_Favorites, IDC_SHOW_BOOKMARK_BAR, GdkModifierType(0) }, 215 { XF86XK_Favorites, IDC_SHOW_BOOKMARK_BAR, GdkModifierType(0) },
216 { XF86XK_History, IDC_SHOW_HISTORY, GdkModifierType(0) }, 216 { XF86XK_History, IDC_SHOW_HISTORY, GdkModifierType(0) },
217 { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK }, 217 { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK },
218 { GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) }, 218 { GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) },
219 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK }, 219 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK },
220 { GDK_p, IDC_PRINT, GDK_CONTROL_MASK }, 220 { GDK_p, IDC_PRINT, GDK_CONTROL_MASK },
221 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK }, 221 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK },
222
223 #if defined(LINUX2)
224 { GDK_f, IDC_FULLSCREEN,
225 GdkModifierType(GDK_CONTROL_MASK | GDK_MOD1_MASK) },
226 { GDK_Delete, IDC_TASK_MANAGER,
227 GdkModifierType(GDK_CONTROL_MASK | GDK_MOD1_MASK) },
228 { GDK_comma, IDC_CONTROL_PANEL, GdkModifierType(GDK_CONTROL_MASK) },
229 #endif
222 }; 230 };
223 231
224 int GetCommandId(guint accel_key, GdkModifierType modifier) { 232 int GetCommandId(guint accel_key, GdkModifierType modifier) {
225 // Bug 9806: If capslock is on, we will get a capital letter as accel_key. 233 // Bug 9806: If capslock is on, we will get a capital letter as accel_key.
226 accel_key = gdk_keyval_to_lower(accel_key); 234 accel_key = gdk_keyval_to_lower(accel_key);
227 // Filter modifier to only include accelerator modifiers. 235 // Filter modifier to only include accelerator modifiers.
228 modifier = static_cast<GdkModifierType>( 236 modifier = static_cast<GdkModifierType>(
229 modifier & gtk_accelerator_get_default_mod_mask()); 237 modifier & gtk_accelerator_get_default_mod_mask());
230 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) { 238 for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
231 if (kAcceleratorMap[i].keyval == accel_key && 239 if (kAcceleratorMap[i].keyval == accel_key &&
(...skipping 1117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1349 *edge = GDK_WINDOW_EDGE_NORTH_EAST; 1357 *edge = GDK_WINDOW_EDGE_NORTH_EAST;
1350 } else if (y < bounds_.height() - kResizeAreaCornerSize) { 1358 } else if (y < bounds_.height() - kResizeAreaCornerSize) {
1351 *edge = GDK_WINDOW_EDGE_EAST; 1359 *edge = GDK_WINDOW_EDGE_EAST;
1352 } else { 1360 } else {
1353 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; 1361 *edge = GDK_WINDOW_EDGE_SOUTH_EAST;
1354 } 1362 }
1355 return true; 1363 return true;
1356 } 1364 }
1357 NOTREACHED(); 1365 NOTREACHED();
1358 } 1366 }
OLDNEW
« no previous file with comments | « chrome/browser/browser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698