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

chrome/browser/bookmarks/bookmark_drag_data.cc

 // Copyright (c) 2010 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/bookmarks/bookmark_drag_data.h"
 
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "base/basictypes.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
@@ skipping 87 matching lines @@
 
   if (nodes.empty())
     return false;
 
   for (size_t i = 0; i < nodes.size(); ++i)
     elements.push_back(Element(nodes[i]));
 
   return true;
 }
 
+bool BookmarkDragData::ReadFromTuple(const GURL& url, const string16& title) {
+  Clear();
+
+  if (!url.is_valid())
+    return false;
+
+  Element element;
+  element.title = title;
+  element.url = url;
+  element.is_url = true;
+
+  elements.push_back(element);
+}
+
 #if !defined(OS_MACOSX)
 void BookmarkDragData::WriteToClipboard(Profile* profile) const {
   ScopedClipboardWriter scw(g_browser_process->clipboard());
 
   // If there is only one element and it is a URL, write the URL to the
   // clipboard.
   if (elements.size() == 1 && elements[0].is_url) {
     const string16& title = elements[0].title;
     std::string url = elements[0].url.spec();
 
@@ skipping 89 matching lines @@
 
   if (data.HasCustomFormat(GetBookmarkCustomFormat())) {
     Pickle drag_data_pickle;
     if (data.GetPickledData(GetBookmarkCustomFormat(), &drag_data_pickle)) {
       if (!ReadFromPickle(&drag_data_pickle))
         return false;
     }
   } else {
     // See if there is a URL on the clipboard.
     Element element;
+    GURL url;
     std::wstring title;
-    if (data.GetURLAndTitle(&element.url, &title) &&
-        element.url.is_valid()) {
-      element.title = WideToUTF16(title);
-      element.is_url = true;
-      elements.push_back(element);
-    }
-  }
+    if (data.GetURLAndTitle(&url, &title))
+      ReadFromTuple(url, WideToUTF16(title));
+ }
 
   return is_valid();
 }
 #endif
 
 void BookmarkDragData::WriteToPickle(Profile* profile, Pickle* pickle) const {
   FilePath path = profile ? profile->GetPath() : FilePath();
   FilePath::WriteStringTypeToPickle(pickle, path.value());
   pickle->WriteSize(elements.size());
 
@@ skipping 53 matching lines @@
   DCHECK(profile_path_.empty());
 
   if (profile)
     profile_path_ = profile->GetPath().value();
 }
 
 bool BookmarkDragData::IsFromProfile(Profile* profile) const {
   // An empty path means the data is not associated with any profile.
   return !profile_path_.empty() && profile_path_ == profile->GetPath().value();
 }