Correctly update drag status for drags over renderer. This makes things look ...

chrome/browser/gtk/bookmark_utils_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/gtk/bookmark_utils_gtk.h"
 
 #include "app/resource_bundle.h"
 #include "base/gfx/gtk_util.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_dnd_util.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profile.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
@@ skipping 179 matching lines @@
                              static_cast<const guchar*>(pickle.data()),
                              pickle.size());
       break;
     }
     case GtkDndUtil::TEXT_URI_LIST: {
       gchar** uris = reinterpret_cast<gchar**>(malloc(sizeof(gchar*) *
                                                (nodes.size() + 1)));
       for (size_t i = 0; i < nodes.size(); ++i) {
         // If the node is a folder, this will be empty. TODO(estade): figure out
         // if there are any ramifications to passing an empty URI. After a
-        // lttle testing, it seems fine.
+        // little testing, it seems fine.
         const GURL& url = nodes[i]->GetURL();
         // This const cast should be safe as gtk_selection_data_set_uris()
         // makes copies.
         uris[i] = const_cast<gchar*>(url.spec().c_str());
       }
       uris[nodes.size()] = NULL;
 
       gtk_selection_data_set_uris(selection_data, uris);
       free(uris);
       break;
@@ skipping 38 matching lines @@
 }
 
 bool CreateNewBookmarkFromNamedUrl(GtkSelectionData* selection_data,
     BookmarkModel* model, const BookmarkNode* parent, int idx) {
   Pickle data(reinterpret_cast<char*>(selection_data->data),
               selection_data->length);
   void* iter = NULL;
   std::string title_utf8, url_utf8;
   bool rv = data.ReadString(&iter, &title_utf8);
   rv = rv && data.ReadString(&iter, &url_utf8);
-  if (rv)
-    model->AddURL(parent, idx, UTF8ToWide(title_utf8), GURL(url_utf8));
+  if (rv) {
+    GURL url(url_utf8);
+    if (title_utf8.empty())
+      title_utf8 = GetNameForURL(url);
+    model->AddURL(parent, idx, UTF8ToWide(title_utf8), url);
+  }
   return rv;
 }
 
+bool CreateNewBookmarksFromURIList(GtkSelectionData* selection_data,
+    BookmarkModel* model, const BookmarkNode* parent, int idx) {
+  gchar** uris = gtk_selection_data_get_uris(selection_data);
+  if (!uris) {
+    NOTREACHED();
+    return false;
+  }
+
+  for (size_t i = 0; uris[i] != NULL; ++i) {
+    GURL url(uris[i]);
+    std::string title = GetNameForURL(url);
+    model->AddURL(parent, idx++, UTF8ToWide(title), url);
+  }
+
+  g_strfreev(uris);
+  return true;
+}
+
 }  // namespace bookmark_utils