summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 04:12:53 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-09 04:12:53 +0000
commitd029f6802a82c91675c3a256f7380b176718be33 (patch)
treea22b17ed2a62ff2bca1caa109241105f169bfe1a /content
parent088d2277d499f79986415c9d351f84bfdc3811eb (diff)
downloadchromium_src-d029f6802a82c91675c3a256f7380b176718be33.zip
chromium_src-d029f6802a82c91675c3a256f7380b176718be33.tar.gz
chromium_src-d029f6802a82c91675c3a256f7380b176718be33.tar.bz2
Convert more uses of NewRunnableMethod() to base::Bind().
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/8502039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109184 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/clipboard_message_filter.cc5
-rw-r--r--content/browser/tab_contents/web_drag_dest_gtk.cc5
-rw-r--r--content/browser/tab_contents/web_drag_dest_gtk.h4
3 files changed, 8 insertions, 6 deletions
diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc
index ab6577f..2ca1b89 100644
--- a/content/browser/renderer_host/clipboard_message_filter.cc
+++ b/content/browser/renderer_host/clipboard_message_filter.cc
@@ -10,6 +10,7 @@
#include "third_party/zlib/zlib.h"
#endif
+#include "base/bind.h"
#include "base/stl_util.h"
#include "content/common/clipboard_messages.h"
#include "content/public/browser/content_browser_client.h"
@@ -166,8 +167,8 @@ void ClipboardMessageFilter::OnReadImage(
#if defined(USE_X11)
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
- NewRunnableMethod(
- this, &ClipboardMessageFilter::OnReadImageReply, bitmap, reply_msg));
+ base::Bind(
+ &ClipboardMessageFilter::OnReadImageReply, this, bitmap, reply_msg));
#else
OnReadImageReply(bitmap, reply_msg);
#endif
diff --git a/content/browser/tab_contents/web_drag_dest_gtk.cc b/content/browser/tab_contents/web_drag_dest_gtk.cc
index 7fe4ee6..d04f2c2 100644
--- a/content/browser/tab_contents/web_drag_dest_gtk.cc
+++ b/content/browser/tab_contents/web_drag_dest_gtk.cc
@@ -6,6 +6,7 @@
#include <string>
+#include "base/bind.h"
#include "base/file_path.h"
#include "base/message_loop.h"
#include "base/utf_string_conversions.h"
@@ -237,14 +238,14 @@ void WebDragDestGtk::OnDragLeave(GtkWidget* sender, GdkDragContext* context,
// in this order so delay telling it about the drag-leave till we are sure
// we are not getting a drop as well.
MessageLoop::current()->PostTask(FROM_HERE,
- method_factory_.NewRunnableMethod(&WebDragDestGtk::DragLeave));
+ base::Bind(&WebDragDestGtk::DragLeave, method_factory_.GetWeakPtr()));
}
// Called by GTK when the user releases the mouse, executing a drop.
gboolean WebDragDestGtk::OnDragDrop(GtkWidget* sender, GdkDragContext* context,
gint x, gint y, guint time) {
// Cancel that drag leave!
- method_factory_.RevokeAll();
+ method_factory_.InvalidateWeakPtrs();
tab_contents_->render_view_host()->
DragTargetDrop(ui::ClientPoint(widget_), ui::ScreenPoint(widget_));
diff --git a/content/browser/tab_contents/web_drag_dest_gtk.h b/content/browser/tab_contents/web_drag_dest_gtk.h
index 88f9226..3ea4d0b 100644
--- a/content/browser/tab_contents/web_drag_dest_gtk.h
+++ b/content/browser/tab_contents/web_drag_dest_gtk.h
@@ -10,7 +10,7 @@
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
-#include "base/task.h"
+#include "base/memory/weak_ptr.h"
#include "content/common/content_export.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
#include "ui/base/gtk/gtk_signal.h"
@@ -96,7 +96,7 @@ class CONTENT_EXPORT WebDragDestGtk {
// A delegate that can receive drag information about drag events.
WebDragDestDelegate* delegate_;
- ScopedRunnableMethodFactory<WebDragDestGtk> method_factory_;
+ base::WeakPtrFactory<WebDragDestGtk> method_factory_;
DISALLOW_COPY_AND_ASSIGN(WebDragDestGtk);
};