GTK: make tabbed bookmark manager compatible with more types of drops.

chrome/browser/tab_contents/web_drag_dest_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/web_drag_dest_gtk.h"
 
 #include <string>
 
 #include "app/gtk_dnd_util.h"
 #include "base/file_path.h"
@@ skipping 55 matching lines @@
   }
 }
 
 gboolean WebDragDestGtk::OnDragMotion(GtkWidget* sender,
                                       GdkDragContext* context,
                                       gint x, gint y,
                                       guint time) {
   if (context_ != context) {
     context_ = context;
     drop_data_.reset(new WebDropData);
+    bookmark_drag_data_.Clear();
     is_drop_target_ = false;
 
     static int supported_targets[] = {
       gtk_dnd_util::TEXT_PLAIN,
       gtk_dnd_util::TEXT_URI_LIST,
       gtk_dnd_util::TEXT_HTML,
       gtk_dnd_util::NETSCAPE_URL,
       gtk_dnd_util::CHROME_NAMED_URL,
       gtk_dnd_util::CHROME_BOOKMARK_ITEM,
       // TODO(estade): support image drags?
@@ skipping 65 matching lines @@
       drop_data_->text_html =
           UTF8ToUTF16(std::string(reinterpret_cast<char*>(data->data),
                                   data->length));
       // We leave the base URL empty.
     } else if (data->target ==
                gtk_dnd_util::GetAtomForTarget(gtk_dnd_util::NETSCAPE_URL)) {
       std::string netscape_url(reinterpret_cast<char*>(data->data),
                                data->length);
       size_t split = netscape_url.find_first_of('\n');
       if (split != std::string::npos) {
-        drop_data_->url_title = UTF8ToUTF16(netscape_url.substr(0, split));
+        drop_data_->url = GURL(netscape_url.substr(0, split));
         if (split < netscape_url.size() - 1)
-          drop_data_->url = GURL(netscape_url.substr(split + 1));
+          drop_data_->url_title = UTF8ToUTF16(netscape_url.substr(split + 1));
       }
     } else if (data->target ==
                gtk_dnd_util::GetAtomForTarget(gtk_dnd_util::CHROME_NAMED_URL)) {
       gtk_dnd_util::ExtractNamedURL(data,
                                     &drop_data_->url, &drop_data_->url_title);
-    } else if (data->target ==
-               gtk_dnd_util::GetAtomForTarget(
-                   gtk_dnd_util::CHROME_BOOKMARK_ITEM)) {
+    }
+  }
+
+  // For CHROME_BOOKMARK_ITEM, we have to handle the case where the drag source
+  // doesn't have any data available for us. In this case we try to synthesize a
+  // URL bookmark.
+  if (data->target ==
+      gtk_dnd_util::GetAtomForTarget(gtk_dnd_util::CHROME_BOOKMARK_ITEM))  {
+    if (data->data) {
       bookmark_drag_data_.ReadFromVector(
           bookmark_utils::GetNodesFromSelection(
               NULL, data,
               gtk_dnd_util::CHROME_BOOKMARK_ITEM,
               tab_contents_->profile(), NULL, NULL));
       bookmark_drag_data_.SetOriginatingProfile(tab_contents_->profile());
+    } else {
+      bookmark_drag_data_.ReadFromTuple(drop_data_->url,
+                                        drop_data_->url_title);
     }
   }
 
   if (data_requests_ == 0) {
     // Tell the renderer about the drag.
     // |x| and |y| are seemingly arbitrary at this point.
     tab_contents_->render_view_host()->
         DragTargetDragEnter(*drop_data_.get(),
             gtk_util::ClientPoint(widget_),
             gtk_util::ScreenPoint(widget_),
@@ skipping 39 matching lines @@
   // support for (at the moment experimental) drag and drop extensions.
   if (tab_contents_->GetBookmarkDragDelegate())
     tab_contents_->GetBookmarkDragDelegate()->OnDrop(bookmark_drag_data_);
 
   // The second parameter is just an educated guess as to whether or not the
   // drag succeeded, but at least we will get the drag-end animation right
   // sometimes.
   gtk_drag_finish(context, is_drop_target_, FALSE, time);
   return TRUE;
 }