GTK: Drags of images should have titles instead of "".

app/gtk_dnd_util.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 "app/gtk_dnd_util.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/pickle.h"
@@ skipping 128 matching lines @@
   for (size_t i = 0; target_codes[i] != -1; ++i) {
     AddTargetToList(targets, target_codes[i]);
   }
 
   gtk_drag_dest_set_target_list(dest, targets);
   gtk_target_list_unref(targets);
 }
 
 void WriteURLWithName(GtkSelectionData* selection_data,
                       const GURL& url,
-                      const string16& title,
+                      string16 title,
                       int type) {
+  if (title.empty()) {
+    // Can't have an empty title. Set it to the filename extracted from the

[Evan Stade, 2010/11/30 21:28:21]

nit: "Can't"? Isn't it more like "Prefer to avoid"

+    // URL.
+    title = UTF8ToUTF16(url.ExtractFileName());

[sky, 2010/11/30 22:14:08]

Might the filename be empty too?

[Elliot Glaysher, 2010/11/30 22:18:20]

I'm not really concerned about that. In that case, we have the same behaviour as
before (it's not as if we segfault on empty titles, we just create suboptimal
bookmarks). In the case where the title is empty, there isn't an exposed string
for us to grab on to.

+  }
+
   switch (type) {
     case TEXT_PLAIN: {
       gtk_selection_data_set_text(selection_data, url.spec().c_str(),
                                   url.spec().length());
       break;
     }
     case TEXT_URI_LIST: {
       gchar* uri_array[2];
       uri_array[0] = strdup(url.spec().c_str());
       uri_array[1] = NULL;
@@ skipping 64 matching lines @@
     GURL url(uris[i]);
     if (url.is_valid())
       urls->push_back(url);
   }
 
   g_strfreev(uris);
   return true;
 }
 
 }  // namespace gtk_dnd_util