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

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

Issue 7721001: PrintPreview: Make ctrl-shift-p start the native print flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + merge conflicts fix Created 9 years, 3 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
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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 },
149 149
150 // Miscellany. 150 // Miscellany.
151 { GDK_d, IDC_BOOKMARK_ALL_TABS, 151 { GDK_d, IDC_BOOKMARK_ALL_TABS,
152 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 152 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
153 { GDK_d, IDC_BOOKMARK_PAGE, GDK_CONTROL_MASK }, 153 { GDK_d, IDC_BOOKMARK_PAGE, GDK_CONTROL_MASK },
154 { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK }, 154 { GDK_o, IDC_OPEN_FILE, GDK_CONTROL_MASK },
155 { GDK_f, IDC_FIND, GDK_CONTROL_MASK }, 155 { GDK_f, IDC_FIND, GDK_CONTROL_MASK },
156 { GDK_p, IDC_PRINT, GDK_CONTROL_MASK }, 156 { GDK_p, IDC_PRINT, GDK_CONTROL_MASK },
157 { GDK_p, IDC_ADVANCED_PRINT,
158 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
157 { GDK_b, IDC_SHOW_BOOKMARK_BAR, 159 { GDK_b, IDC_SHOW_BOOKMARK_BAR,
158 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 160 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
159 { GDK_o, IDC_SHOW_BOOKMARK_MANAGER, 161 { GDK_o, IDC_SHOW_BOOKMARK_MANAGER,
160 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 162 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
161 { GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) }, 163 { GDK_F11, IDC_FULLSCREEN, GdkModifierType(0) },
162 { GDK_Delete, IDC_CLEAR_BROWSING_DATA, 164 { GDK_Delete, IDC_CLEAR_BROWSING_DATA,
163 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, 165 GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
164 { GDK_h, IDC_SHOW_HISTORY, GDK_CONTROL_MASK }, 166 { GDK_h, IDC_SHOW_HISTORY, GDK_CONTROL_MASK },
165 { GDK_j, IDC_SHOW_DOWNLOADS, GDK_CONTROL_MASK }, 167 { GDK_j, IDC_SHOW_DOWNLOADS, GDK_CONTROL_MASK },
166 { GDK_F1, IDC_HELP_PAGE, GdkModifierType(0) }, 168 { GDK_F1, IDC_HELP_PAGE, GdkModifierType(0) },
(...skipping 26 matching lines...) Expand all
193 all_accelerators_.push_back(std::make_pair(entry.command_id, accelerator)); 195 all_accelerators_.push_back(std::make_pair(entry.command_id, accelerator));
194 196
195 if (primary_accelerators_.find(entry.command_id) == 197 if (primary_accelerators_.find(entry.command_id) ==
196 primary_accelerators_.end()) { 198 primary_accelerators_.end()) {
197 primary_accelerators_[entry.command_id] = accelerator; 199 primary_accelerators_[entry.command_id] = accelerator;
198 } 200 }
199 } 201 }
200 } 202 }
201 203
202 AcceleratorsGtk::~AcceleratorsGtk() {} 204 AcceleratorsGtk::~AcceleratorsGtk() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698