diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-29 23:36:13 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-29 23:36:13 +0000 |
| commit | be61b42e45eb49e26789aaa4bb74763a61b26593 (patch) | |
| tree | ec1f5847261b531913ecb7a4b3c8920d81a88d0d /chrome/browser/gtk/bookmark_manager_gtk.cc | |
| parent | 00c2ecbccaf81b313c9f2a74354012452db65642 (diff) | |
| download | chromium_src-be61b42e45eb49e26789aaa4bb74763a61b26593.zip chromium_src-be61b42e45eb49e26789aaa4bb74763a61b26593.tar.gz chromium_src-be61b42e45eb49e26789aaa4bb74763a61b26593.tar.bz2 | |
More web contents dragging.
TEST=drag an image (such as the google logo from google.com) into gimp or onto the desktop.
BUG=http://crbug.com/15429
Review URL: http://codereview.chromium.org/151033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_manager_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_manager_gtk.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc index bd781a1..a385426 100644 --- a/chrome/browser/gtk/bookmark_manager_gtk.cc +++ b/chrome/browser/gtk/bookmark_manager_gtk.cc @@ -17,7 +17,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/gtk/bookmark_tree_model.h" #include "chrome/browser/gtk/bookmark_utils_gtk.h" -#include "chrome/browser/gtk/dnd_registry.h" +#include "chrome/browser/gtk/gtk_dnd_util.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/profile.h" #include "chrome/common/chrome_paths.h" @@ -381,8 +381,8 @@ GtkWidget* BookmarkManagerGtk::MakeLeftPane() { // The left side is only a drag destination (not a source). gtk_drag_dest_set(left_tree_view_, GTK_DEST_DEFAULT_DROP, NULL, 0, GDK_ACTION_MOVE); - dnd::SetDestTargetListFromCodeMask(left_tree_view_, - dnd::X_CHROME_BOOKMARK_ITEM); + GtkDndUtil::SetDestTargetListFromCodeMask(left_tree_view_, + GtkDndUtil::X_CHROME_BOOKMARK_ITEM); g_signal_connect(left_tree_view_, "drag-data-received", G_CALLBACK(&OnLeftTreeViewDragReceived), this); @@ -447,8 +447,8 @@ GtkWidget* BookmarkManagerGtk::MakeRightPane() { gtk_drag_source_set(right_tree_view_, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_MOVE); - dnd::SetSourceTargetListFromCodeMask(right_tree_view_, - dnd::X_CHROME_BOOKMARK_ITEM); + GtkDndUtil::SetSourceTargetListFromCodeMask( + right_tree_view_, GtkDndUtil::X_CHROME_BOOKMARK_ITEM); // We connect to drag dest signals, but we don't actually enable the widget // as a drag destination unless it corresponds to the contents of a folder. @@ -533,8 +533,8 @@ void BookmarkManagerGtk::BuildRightStore() { gtk_drag_dest_set(right_tree_view_, GTK_DEST_DEFAULT_ALL, NULL, 0, GDK_ACTION_MOVE); - dnd::SetDestTargetListFromCodeMask(right_tree_view_, - dnd::X_CHROME_BOOKMARK_ITEM); + GtkDndUtil::SetDestTargetListFromCodeMask(right_tree_view_, + GtkDndUtil::X_CHROME_BOOKMARK_ITEM); } else { gtk_tree_view_column_set_visible(path_column_, TRUE); @@ -1019,8 +1019,8 @@ gboolean BookmarkManagerGtk::OnRightTreeViewMotion(GtkWidget* tree_view, if (gtk_drag_check_threshold(tree_view, bm->mousedown_event_.x, bm->mousedown_event_.y, event->x, event->y)) { bm->delaying_mousedown_ = false; - GtkTargetList* targets = - dnd::GetTargetListFromCodeMask(dnd::X_CHROME_BOOKMARK_ITEM); + GtkTargetList* targets = GtkDndUtil::GetTargetListFromCodeMask( + GtkDndUtil::X_CHROME_BOOKMARK_ITEM); gtk_drag_begin(tree_view, targets, GDK_ACTION_MOVE, 1, reinterpret_cast<GdkEvent*>(event)); // The drag adds a ref; let it own the list. |