From 49fd9da3932c3c6e94ca1d9f35c9c90106859128 Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Wed, 17 Mar 2010 21:00:47 +0000 Subject: Revert r41803 and r41799 BUG=38414 TEST=none TBR=jam Review URL: http://codereview.chromium.org/1039006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41876 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gtk/notifications/balloon_view_host_gtk.h | 4 +--- chrome/browser/gtk/tab_contents_drag_source.cc | 14 +------------- chrome/browser/gtk/tab_contents_drag_source.h | 11 +---------- 3 files changed, 3 insertions(+), 26 deletions(-) (limited to 'chrome/browser/gtk') diff --git a/chrome/browser/gtk/notifications/balloon_view_host_gtk.h b/chrome/browser/gtk/notifications/balloon_view_host_gtk.h index de71a41..22e8cda 100644 --- a/chrome/browser/gtk/notifications/balloon_view_host_gtk.h +++ b/chrome/browser/gtk/notifications/balloon_view_host_gtk.h @@ -80,9 +80,7 @@ class BalloonViewHost : public RenderViewHostDelegate, const gfx::Rect& initial_pos) {} virtual void ShowContextMenu(const ContextMenuParams& params) {} virtual void StartDragging(const WebDropData& drop_data, - WebKit::WebDragOperationsMask allowed_ops, - const SkBitmap& image, - const gfx::Point& image_offset) {} + WebKit::WebDragOperationsMask allowed_ops) {} virtual void UpdateDragCursor(WebKit::WebDragOperation operation) {} virtual void GotFocus() {} virtual void TakeFocus(bool reverse) {} diff --git a/chrome/browser/gtk/tab_contents_drag_source.cc b/chrome/browser/gtk/tab_contents_drag_source.cc index 6d9ca4c..081feb5 100644 --- a/chrome/browser/gtk/tab_contents_drag_source.cc +++ b/chrome/browser/gtk/tab_contents_drag_source.cc @@ -70,9 +70,7 @@ TabContents* TabContentsDragSource::tab_contents() const { } 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()) @@ -101,8 +99,6 @@ void TabContentsDragSource::StartDragging(const WebDropData& drop_data, } 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) { @@ -308,14 +304,6 @@ void TabContentsDragSource::OnDragBegin(GdkDragContext* drag_context) { 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, diff --git a/chrome/browser/gtk/tab_contents_drag_source.h b/chrome/browser/gtk/tab_contents_drag_source.h index 7740ee6..aa0216e 100644 --- a/chrome/browser/gtk/tab_contents_drag_source.h +++ b/chrome/browser/gtk/tab_contents_drag_source.h @@ -9,12 +9,10 @@ #include "base/basictypes.h" #include "base/file_path.h" -#include "base/gfx/point.h" #include "base/message_loop.h" #include "base/string16.h" #include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" class TabContents; @@ -33,9 +31,7 @@ class TabContentsDragSource : public MessageLoopForUI::Observer { // Starts a drag for the tab contents this TabContentsDragSource was // created for. void StartDragging(const WebDropData& drop_data, - GdkEventButton* last_mouse_down, - const SkBitmap& image, - const gfx::Point& image_offset); + GdkEventButton* last_mouse_down); // MessageLoop::Observer implementation: virtual void WillProcessEvent(GdkEvent* event); @@ -83,11 +79,6 @@ class TabContentsDragSource : public MessageLoopForUI::Observer { // view). Non-NULL iff there is a current drag. scoped_ptr drop_data_; - // The image used for depicting the drag, and the offset between the cursor - // and the top left pixel. - SkBitmap drag_image_; - gfx::Point image_offset_; - // The mime type for the file contents of the current drag (if any). GdkAtom drag_file_mime_type_; -- cgit v1.1