OLD | NEW |
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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 { XF86XK_Stop, IDC_STOP, GdkModifierType(0) }, | 205 { XF86XK_Stop, IDC_STOP, GdkModifierType(0) }, |
206 { GDK_Left, IDC_BACK, GDK_MOD1_MASK }, | 206 { GDK_Left, IDC_BACK, GDK_MOD1_MASK }, |
207 { GDK_BackSpace, IDC_BACK, GdkModifierType(0) }, | 207 { GDK_BackSpace, IDC_BACK, GdkModifierType(0) }, |
208 { XF86XK_Back, IDC_BACK, GdkModifierType(0) }, | 208 { XF86XK_Back, IDC_BACK, GdkModifierType(0) }, |
209 { GDK_Right, IDC_FORWARD, GDK_MOD1_MASK }, | 209 { GDK_Right, IDC_FORWARD, GDK_MOD1_MASK }, |
210 { GDK_BackSpace, IDC_FORWARD, GDK_SHIFT_MASK }, | 210 { GDK_BackSpace, IDC_FORWARD, GDK_SHIFT_MASK }, |
211 { XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) }, | 211 { XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) }, |
212 { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK }, | 212 { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK }, |
213 { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, | 213 { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, |
214 { GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK }, | 214 { GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK }, |
| 215 { GDK_F5, IDC_RELOAD, GDK_SHIFT_MASK }, |
215 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, | 216 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, |
216 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, | 217 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, |
217 | 218 |
218 // Miscellany. | 219 // Miscellany. |
219 { GDK_d, IDC_STAR, GDK_CONTROL_MASK }, | 220 { GDK_d, IDC_STAR, GDK_CONTROL_MASK }, |
220 { XF86XK_AddFavorite, IDC_STAR, GdkModifierType(0) }, | 221 { XF86XK_AddFavorite, IDC_STAR, GdkModifierType(0) }, |
221 { XF86XK_Favorites, IDC_SHOW_BOOKMARK_BAR, GdkModifierType(0) }, | 222 { XF86XK_Favorites, IDC_SHOW_BOOKMARK_BAR, GdkModifierType(0) }, |
222 { XF86XK_History, IDC_SHOW_HISTORY, GdkModifierType(0) }, | 223 { XF86XK_History, IDC_SHOW_HISTORY, GdkModifierType(0) }, |
223 { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK }, | 224 { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK }, |
224 { GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) }, | 225 { GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) }, |
(...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1444 *edge = GDK_WINDOW_EDGE_NORTH_EAST; | 1445 *edge = GDK_WINDOW_EDGE_NORTH_EAST; |
1445 } else if (y < bounds_.height() - kResizeAreaCornerSize) { | 1446 } else if (y < bounds_.height() - kResizeAreaCornerSize) { |
1446 *edge = GDK_WINDOW_EDGE_EAST; | 1447 *edge = GDK_WINDOW_EDGE_EAST; |
1447 } else { | 1448 } else { |
1448 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; | 1449 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; |
1449 } | 1450 } |
1450 return true; | 1451 return true; |
1451 } | 1452 } |
1452 NOTREACHED(); | 1453 NOTREACHED(); |
1453 } | 1454 } |
OLD | NEW |