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

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

Issue 6893046: added CTRL+Click and SHIFT+Click handler for context menu, Back and Forward. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: make this patch applicable to the latest trunk Created 9 years, 6 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/ui/gtk/gtk_util.h ('k') | chrome/browser/ui/gtk/menu_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/gtk_util.h" 5 #include "chrome/browser/ui/gtk/gtk_util.h"
6 6
7 #include <cairo/cairo.h> 7 #include <cairo/cairo.h>
8 #include <gdk/gdkx.h> 8 #include <gdk/gdkx.h>
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 28 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
29 #include "content/browser/disposition_utils.h" 29 #include "content/browser/disposition_utils.h"
30 #include "content/browser/renderer_host/render_view_host.h" 30 #include "content/browser/renderer_host/render_view_host.h"
31 #include "content/browser/tab_contents/tab_contents.h" 31 #include "content/browser/tab_contents/tab_contents.h"
32 #include "content/common/renderer_preferences.h" 32 #include "content/common/renderer_preferences.h"
33 #include "googleurl/src/gurl.h" 33 #include "googleurl/src/gurl.h"
34 #include "grit/theme_resources.h" 34 #include "grit/theme_resources.h"
35 #include "grit/theme_resources_standard.h" 35 #include "grit/theme_resources_standard.h"
36 #include "third_party/skia/include/core/SkBitmap.h" 36 #include "third_party/skia/include/core/SkBitmap.h"
37 #include "third_party/skia/include/core/SkColor.h" 37 #include "third_party/skia/include/core/SkColor.h"
38 #include "ui/base/events.h"
38 #include "ui/base/l10n/l10n_util.h" 39 #include "ui/base/l10n/l10n_util.h"
39 #include "ui/base/resource/resource_bundle.h" 40 #include "ui/base/resource/resource_bundle.h"
40 #include "ui/base/x/x11_util.h" 41 #include "ui/base/x/x11_util.h"
41 #include "ui/gfx/gtk_util.h" 42 #include "ui/gfx/gtk_util.h"
42 #include "ui/gfx/image/image.h" 43 #include "ui/gfx/image/image.h"
43 44
44 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
45 #include "chrome/browser/chromeos/frame/browser_view.h" 46 #include "chrome/browser/chromeos/frame/browser_view.h"
46 #include "chrome/browser/chromeos/native_dialog_window.h" 47 #include "chrome/browser/chromeos/native_dialog_window.h"
47 #else 48 #else
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 197
197 WindowOpenDisposition DispositionFromEventFlags(guint event_flags) { 198 WindowOpenDisposition DispositionFromEventFlags(guint event_flags) {
198 return disposition_utils::DispositionFromClick( 199 return disposition_utils::DispositionFromClick(
199 event_flags & GDK_BUTTON2_MASK, 200 event_flags & GDK_BUTTON2_MASK,
200 event_flags & GDK_MOD1_MASK, 201 event_flags & GDK_MOD1_MASK,
201 event_flags & GDK_CONTROL_MASK, 202 event_flags & GDK_CONTROL_MASK,
202 event_flags & GDK_META_MASK, 203 event_flags & GDK_META_MASK,
203 event_flags & GDK_SHIFT_MASK); 204 event_flags & GDK_SHIFT_MASK);
204 } 205 }
205 206
207 int GetEventFlagsFromGdkState(guint state) {
208 int flags = 0;
209 flags |= (state & GDK_LOCK_MASK) ? ui::EF_CAPS_LOCK_DOWN : 0;
210 flags |= (state & GDK_CONTROL_MASK) ? ui::EF_CONTROL_DOWN : 0;
211 flags |= (state & GDK_SHIFT_MASK) ? ui::EF_SHIFT_DOWN : 0;
212 flags |= (state & GDK_MOD1_MASK) ? ui::EF_ALT_DOWN : 0;
213 flags |= (state & GDK_BUTTON1_MASK) ? ui::EF_LEFT_BUTTON_DOWN : 0;
214 flags |= (state & GDK_BUTTON2_MASK) ? ui::EF_MIDDLE_BUTTON_DOWN : 0;
215 flags |= (state & GDK_BUTTON3_MASK) ? ui::EF_RIGHT_BUTTON_DOWN : 0;
216 return flags;
217 }
218
206 } // namespace event_utils 219 } // namespace event_utils
207 220
208 namespace gtk_util { 221 namespace gtk_util {
209 222
210 const GdkColor kGdkWhite = GDK_COLOR_RGB(0xff, 0xff, 0xff); 223 const GdkColor kGdkWhite = GDK_COLOR_RGB(0xff, 0xff, 0xff);
211 const GdkColor kGdkGray = GDK_COLOR_RGB(0x7f, 0x7f, 0x7f); 224 const GdkColor kGdkGray = GDK_COLOR_RGB(0x7f, 0x7f, 0x7f);
212 const GdkColor kGdkBlack = GDK_COLOR_RGB(0x00, 0x00, 0x00); 225 const GdkColor kGdkBlack = GDK_COLOR_RGB(0x00, 0x00, 0x00);
213 const GdkColor kGdkGreen = GDK_COLOR_RGB(0x00, 0xff, 0x00); 226 const GdkColor kGdkGreen = GDK_COLOR_RGB(0x00, 0xff, 0x00);
214 227
215 GtkWidget* CreateLabeledControlsGroup(std::vector<GtkWidget*>* labels, 228 GtkWidget* CreateLabeledControlsGroup(std::vector<GtkWidget*>* labels,
(...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 1294
1282 void DoCopy(BrowserWindow* window) { 1295 void DoCopy(BrowserWindow* window) {
1283 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard"); 1296 DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
1284 } 1297 }
1285 1298
1286 void DoPaste(BrowserWindow* window) { 1299 void DoPaste(BrowserWindow* window) {
1287 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard"); 1300 DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
1288 } 1301 }
1289 1302
1290 } // namespace gtk_util 1303 } // namespace gtk_util
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/gtk_util.h ('k') | chrome/browser/ui/gtk/menu_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698