| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, | 128 { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, |
| 129 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_CONTROL_MASK }, | 129 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_CONTROL_MASK }, |
| 130 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_SHIFT_MASK }, | 130 { GDK_F5, IDC_RELOAD_IGNORING_CACHE, GDK_SHIFT_MASK }, |
| 131 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, | 131 { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, |
| 132 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, | 132 { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, |
| 133 | 133 |
| 134 // Dev tools. | 134 // Dev tools. |
| 135 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK }, | 135 { GDK_u, IDC_VIEW_SOURCE, GDK_CONTROL_MASK }, |
| 136 { GDK_i, IDC_DEV_TOOLS, | 136 { GDK_i, IDC_DEV_TOOLS, |
| 137 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 137 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
| 138 { GDK_F12, IDC_DEV_TOOLS, GdkModifierType(0) }, | 138 { GDK_F12, IDC_DEV_TOOLS_TOGGLE, GdkModifierType(0) }, |
| 139 { GDK_j, IDC_DEV_TOOLS_CONSOLE, | 139 { GDK_j, IDC_DEV_TOOLS_CONSOLE, |
| 140 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 140 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
| 141 { GDK_c, IDC_DEV_TOOLS_INSPECT, | 141 { GDK_c, IDC_DEV_TOOLS_INSPECT, |
| 142 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, | 142 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, |
| 143 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK }, | 143 { GDK_Escape, IDC_TASK_MANAGER, GDK_SHIFT_MASK }, |
| 144 | 144 |
| 145 // Editing. | 145 // Editing. |
| 146 { GDK_c, IDC_COPY, GDK_CONTROL_MASK }, | 146 { GDK_c, IDC_COPY, GDK_CONTROL_MASK }, |
| 147 { GDK_x, IDC_CUT, GDK_CONTROL_MASK }, | 147 { GDK_x, IDC_CUT, GDK_CONTROL_MASK }, |
| 148 { GDK_v, IDC_PASTE, GDK_CONTROL_MASK }, | 148 { GDK_v, IDC_PASTE, GDK_CONTROL_MASK }, |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 all_accelerators_.push_back(std::make_pair(entry.command_id, accelerator)); | 199 all_accelerators_.push_back(std::make_pair(entry.command_id, accelerator)); |
| 200 | 200 |
| 201 if (primary_accelerators_.find(entry.command_id) == | 201 if (primary_accelerators_.find(entry.command_id) == |
| 202 primary_accelerators_.end()) { | 202 primary_accelerators_.end()) { |
| 203 primary_accelerators_[entry.command_id] = accelerator; | 203 primary_accelerators_[entry.command_id] = accelerator; |
| 204 } | 204 } |
| 205 } | 205 } |
| 206 } | 206 } |
| 207 | 207 |
| 208 AcceleratorsGtk::~AcceleratorsGtk() {} | 208 AcceleratorsGtk::~AcceleratorsGtk() {} |
| OLD | NEW |