Merge 41876 - Revert r41803 and r41799...

chrome/browser/gtk/tab_contents_drag_source.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/tab_contents_drag_source.h"
 
 #include <string>
 
 #include "app/gtk_dnd_util.h"
 #include "base/file_util.h"
@@ skipping 52 matching lines @@
   gtk_widget_destroy(drag_widget_);
   g_object_unref(drag_widget_);
   drag_widget_ = NULL;
 }
 
 TabContents* TabContentsDragSource::tab_contents() const {
   return tab_contents_view_->tab_contents();
 }
 
 void TabContentsDragSource::StartDragging(const WebDropData& drop_data,
-                                          GdkEventButton* last_mouse_down,
-                                          const SkBitmap& image,
-                                          const gfx::Point& image_offset) {
+                                          GdkEventButton* last_mouse_down) {
   int targets_mask = 0;
 
   if (!drop_data.plain_text.empty())
     targets_mask |= gtk_dnd_util::TEXT_PLAIN;
   if (drop_data.url.is_valid()) {
     targets_mask |= gtk_dnd_util::TEXT_URI_LIST;
     targets_mask |= gtk_dnd_util::CHROME_NAMED_URL;
     targets_mask |= gtk_dnd_util::NETSCAPE_URL;
   }
   if (!drop_data.text_html.empty())
     targets_mask |= gtk_dnd_util::TEXT_HTML;
   if (!drop_data.file_contents.empty())
     targets_mask |= gtk_dnd_util::CHROME_WEBDROP_FILE_CONTENTS;
   if (!drop_data.download_metadata.empty() &&
       drag_download_util::ParseDownloadMetadata(drop_data.download_metadata,
                                                 &wide_download_mime_type_,
                                                 &download_file_name_,
                                                 &download_url_)) {
     targets_mask |= gtk_dnd_util::DIRECT_SAVE_FILE;
   }
 
   if (targets_mask == 0) {
     NOTIMPLEMENTED();
     if (tab_contents()->render_view_host())
       tab_contents()->render_view_host()->DragSourceSystemDragEnded();
   }
 
   drop_data_.reset(new WebDropData(drop_data));
-  drag_image_ = image;
-  image_offset_ = image_offset;
 
   GtkTargetList* list = gtk_dnd_util::GetTargetListFromCodeMask(targets_mask);
   if (targets_mask & gtk_dnd_util::CHROME_WEBDROP_FILE_CONTENTS) {
     drag_file_mime_type_ = gdk_atom_intern(
         mime_util::GetDataMimeType(drop_data.file_contents).c_str(), FALSE);
     gtk_target_list_add(list, drag_file_mime_type_,
                         0, gtk_dnd_util::CHROME_WEBDROP_FILE_CONTENTS);
   }
 
   drag_failed_ = false;
@@ skipping 185 matching lines @@
                         gtk_dnd_util::GetAtomForTarget(
                             gtk_dnd_util::DIRECT_SAVE_FILE),
                         gtk_dnd_util::GetAtomForTarget(
                             gtk_dnd_util::TEXT_PLAIN_NO_CHARSET),
                         8,
                         GDK_PROP_MODE_REPLACE,
                         reinterpret_cast<const guchar*>(
                             generated_download_file_name.value().c_str()),
                         generated_download_file_name.value().length());
   }
-
-  if (!drag_image_.isNull()) {
-    GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&drag_image_);
-    gtk_drag_set_icon_pixbuf(drag_context, pixbuf,
-                             image_offset_.x(), image_offset_.y());
-    // Let the drag take ownership.
-    g_object_unref(pixbuf);
-  }
 }
 
 void TabContentsDragSource::OnDragEnd(GdkDragContext* drag_context,
                                       WebDragOperation operation) {
   MessageLoopForUI::current()->RemoveObserver(this);
 
   if (!download_url_.is_empty()) {
     gdk_property_delete(drag_context->source_window,
                         gtk_dnd_util::GetAtomForTarget(
                             gtk_dnd_util::DIRECT_SAVE_FILE));
@@ skipping 11 matching lines @@
 
   if (tab_contents()->render_view_host())
     tab_contents()->render_view_host()->DragSourceSystemDragEnded();
 
   drop_data_.reset();
 }
 
 gfx::NativeView TabContentsDragSource::GetContentNativeView() const {
   return tab_contents_view_->GetContentNativeView();
 }