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

Side by Side Diff: chrome/browser/gtk/tabs/tab_gtk.cc

Issue 151033: More web contents dragging. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more Dones 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/gtk/gtk_dnd_util.cc ('k') | chrome/browser/gtk/tabs/tab_strip_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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/tabs/tab_gtk.h" 5 #include "chrome/browser/gtk/tabs/tab_gtk.h"
6 6
7 #include "app/gfx/path.h" 7 #include "app/gfx/path.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "chrome/browser/gtk/dnd_registry.h" 10 #include "chrome/browser/gtk/gtk_dnd_util.h"
11 #include "chrome/browser/gtk/menu_gtk.h" 11 #include "chrome/browser/gtk/menu_gtk.h"
12 #include "grit/generated_resources.h" 12 #include "grit/generated_resources.h"
13 #include "grit/theme_resources.h" 13 #include "grit/theme_resources.h"
14 14
15 namespace { 15 namespace {
16 16
17 void SetEmptyDragIcon(GtkWidget* widget) { 17 void SetEmptyDragIcon(GtkWidget* widget) {
18 GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 1, 1); 18 GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
19 gtk_drag_source_set_icon_pixbuf(widget, pixbuf); 19 gtk_drag_source_set_icon_pixbuf(widget, pixbuf);
20 g_object_unref(pixbuf); 20 g_object_unref(pixbuf);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 TabGtk::TabGtk(TabDelegate* delegate) 101 TabGtk::TabGtk(TabDelegate* delegate)
102 : TabRendererGtk(), 102 : TabRendererGtk(),
103 delegate_(delegate), 103 delegate_(delegate),
104 closing_(false), 104 closing_(false),
105 dragging_(false) { 105 dragging_(false) {
106 event_box_ = gtk_event_box_new(); 106 event_box_ = gtk_event_box_new();
107 g_object_ref(event_box_); 107 g_object_ref(event_box_);
108 gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_), FALSE); 108 gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_), FALSE);
109 gtk_drag_source_set(event_box_, GDK_BUTTON1_MASK, 109 gtk_drag_source_set(event_box_, GDK_BUTTON1_MASK,
110 NULL, 0, GDK_ACTION_MOVE); 110 NULL, 0, GDK_ACTION_MOVE);
111 dnd::SetSourceTargetListFromCodeMask(event_box_, dnd::X_CHROME_TAB); 111 GtkDndUtil::SetSourceTargetListFromCodeMask(event_box_,
112 GtkDndUtil::X_CHROME_TAB);
112 g_signal_connect(G_OBJECT(event_box_), "button-press-event", 113 g_signal_connect(G_OBJECT(event_box_), "button-press-event",
113 G_CALLBACK(OnMousePress), this); 114 G_CALLBACK(OnMousePress), this);
114 g_signal_connect(G_OBJECT(event_box_), "button-release-event", 115 g_signal_connect(G_OBJECT(event_box_), "button-release-event",
115 G_CALLBACK(OnMouseRelease), this); 116 G_CALLBACK(OnMouseRelease), this);
116 g_signal_connect(G_OBJECT(event_box_), "enter-notify-event", 117 g_signal_connect(G_OBJECT(event_box_), "enter-notify-event",
117 G_CALLBACK(OnEnterNotify), this); 118 G_CALLBACK(OnEnterNotify), this);
118 g_signal_connect(G_OBJECT(event_box_), "leave-notify-event", 119 g_signal_connect(G_OBJECT(event_box_), "leave-notify-event",
119 G_CALLBACK(OnLeaveNotify), this); 120 G_CALLBACK(OnLeaveNotify), this);
120 g_signal_connect_after(G_OBJECT(event_box_), "drag-begin", 121 g_signal_connect_after(G_OBJECT(event_box_), "drag-begin",
121 G_CALLBACK(OnDragBegin), this); 122 G_CALLBACK(OnDragBegin), this);
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 if (!menu_controller_.get()) 286 if (!menu_controller_.get())
286 menu_controller_.reset(new ContextMenuController(this)); 287 menu_controller_.reset(new ContextMenuController(this));
287 288
288 menu_controller_->RunMenu(); 289 menu_controller_->RunMenu();
289 } 290 }
290 291
291 void TabGtk::ContextMenuClosed() { 292 void TabGtk::ContextMenuClosed() {
292 delegate()->StopAllHighlighting(); 293 delegate()->StopAllHighlighting();
293 menu_controller_.reset(); 294 menu_controller_.reset();
294 } 295 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/gtk_dnd_util.cc ('k') | chrome/browser/gtk/tabs/tab_strip_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698