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

chrome/browser/tab_contents/tab_contents_view_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/tab_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "app/l10n_util.h"
 #include "base/mime_util.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
+#include "base/pickle.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/gtk/blocked_popup_container_view_gtk.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/constrained_window_gtk.h"
 #include "chrome/browser/gtk/gtk_dnd_util.h"
 #include "chrome/browser/gtk/gtk_floating_container.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/sad_tab_gtk.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_gtk.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
-#include "grit/app_strings.h"
-#include "net/base/net_util.h"
 #include "webkit/glue/webdropdata.h"
 
 namespace {
 
 // TODO(erg): I have no idea how to programatically figure out how wide the
 // vertical scrollbar is. Hack it with a hardcoded value for now.
 const int kScrollbarWidthHack = 25;
 
 // Called when the content view gtk widget is tabbed to, or after the call to
 // gtk_widget_child_focus() in TakeFocus(). We return true
@@ skipping 175 matching lines @@
     }
   }
 
   // This is called when the renderer responds to a drag motion event. We must
   // update the system drag cursor.
   void UpdateDragStatus(bool is_drop_target) {
     if (context_) {
       // TODO(estade): we might want to support other actions besides copy,
       // but that would increase the cost of getting our drag success guess
       // wrong.
-      gdk_drag_status(context_, GDK_ACTION_COPY, drag_over_time_);
+      gdk_drag_status(context_, is_drop_target ? GDK_ACTION_COPY :
+                                static_cast<GdkDragAction>(0),
+                      drag_over_time_);
       is_drop_target_ = false;
     }
   }
 
   // Informs the renderer when a system drag has left the render view.
   // See OnDragLeave().
   void DragLeave() {
     tab_contents_->render_view_host()->DragTargetDragLeave();
   }
 
@@ skipping 568 matching lines @@
       std::string utf8_text = UTF16ToUTF8(view->drop_data_->text_html);
       gtk_selection_data_set(selection_data,
           GtkDndUtil::GetAtomForTarget(GtkDndUtil::TEXT_HTML),
           bits_per_byte,
           reinterpret_cast<const guchar*>(utf8_text.c_str()),
           utf8_text.length());
       break;
     }
 
     case GtkDndUtil::CHROME_NAMED_URL: {
-      std::string name;
-      const GURL& url = view->drop_data_->url;
-      if (!view->drop_data_->url_title.empty()) {
-        name = UTF16ToUTF8(view->drop_data_->url_title);
-      } else if (url.is_valid()) {
-        name = WideToUTF8(net::GetSuggestedFilename(
-            url, std::string(), std::string(), std::wstring()));
-      } else {
-        // Nothing else can be done, just use a default.
-        name = l10n_util::GetStringUTF8(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME);
-      }
       Pickle pickle;
-      pickle.WriteString(name);
-      pickle.WriteString(url.spec());
+      pickle.WriteString(UTF16ToUTF8(view->drop_data_->url_title));
+      pickle.WriteString(view->drop_data_->url.spec());
       gtk_selection_data_set(selection_data,
           GtkDndUtil::GetAtomForTarget(GtkDndUtil::CHROME_NAMED_URL),
           bits_per_byte,
           reinterpret_cast<const guchar*>(pickle.data()),
           pickle.size());
       break;
     }
 
     case GtkDndUtil::CHROME_WEBDROP_FILE_CONTENTS: {
       gtk_selection_data_set(selection_data,
@@ skipping 94 matching lines @@
     gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                      widget, "x", &value);
 
     int child_y = std::max(half_view_height - (requisition.height / 2), 0);
     g_value_set_int(&value, child_y);
     gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                      widget, "y", &value);
     g_value_unset(&value);
   }
 }