summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-20 01:34:12 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-20 01:34:12 +0000
commita58298b335fc28652aacdf46724530bdd970a1ae (patch)
tree2c7363e9f62ba4ad7855aacb515ee453464353de
parentb87a475c7011cc998401582d97d7a2b5fe23fe9a (diff)
downloadchromium_src-a58298b335fc28652aacdf46724530bdd970a1ae.zip
chromium_src-a58298b335fc28652aacdf46724530bdd970a1ae.tar.gz
chromium_src-a58298b335fc28652aacdf46724530bdd970a1ae.tar.bz2
Allow link drags from the bookmark manager out to the Gnome desktop
(nautilus). This should create a shortcut to the site rather than downloading the file to the desktop. I didn't do this before because of the menu crasher. BUG=24210 Review URL: http://codereview.chromium.org/553024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36592 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/bookmark_manager_gtk.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc
index 4422230..7f4947f 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.cc
+++ b/chrome/browser/gtk/bookmark_manager_gtk.cc
@@ -551,11 +551,12 @@ GtkWidget* BookmarkManagerGtk::MakeRightPane() {
g_signal_connect(right_tree_view_, "key-press-event",
G_CALLBACK(OnTreeViewKeyPress), this);
- // We don't advertise GDK_ACTION_COPY, but since we don't explicitly do
- // any deleting following a succesful move, this should work.
- gtk_drag_source_set(right_tree_view_,
- GDK_BUTTON1_MASK,
- NULL, 0, GDK_ACTION_MOVE);
+ // GDK_ACTION_MOVE is necessary to reorder bookmarks within the
+ // right tree. COPY and LINK are necessary for drags to the
+ // Gnome desktop (nautilus).
+ gtk_drag_source_set(right_tree_view_, GDK_BUTTON1_MASK, NULL, 0,
+ static_cast<GdkDragAction>(GDK_ACTION_MOVE | GDK_ACTION_COPY |
+ GDK_ACTION_LINK));
GtkDndUtil::SetSourceTargetListFromCodeMask(
right_tree_view_, kSourceTargetMask);