diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 18:40:30 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 18:40:30 +0000 |
| commit | 30c1eea51e20355f11cc37b1bf82ac11644ab2b8 (patch) | |
| tree | b031284a67e6d1618427301c83cd2ff6106b645e /chrome/browser/nacl_host | |
| parent | 35d5280876154e0dab2f472314e49dce2ced217b (diff) | |
| download | chromium_src-30c1eea51e20355f11cc37b1bf82ac11644ab2b8.zip chromium_src-30c1eea51e20355f11cc37b1bf82ac11644ab2b8.tar.gz chromium_src-30c1eea51e20355f11cc37b1bf82ac11644ab2b8.tar.bz2 | |
base::Bind: Convert FileUtilProxy::CreateOrOpenCallback.
BUG=none
TEST=none
R=csilv@chromium.org
Review URL: http://codereview.chromium.org/8311010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_host')
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 3957c5b..195a2fa 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -10,6 +10,7 @@ #include <fcntl.h> #endif +#include "base/bind.h" #include "base/command_line.h" #include "base/path_service.h" #include "base/stringprintf.h" @@ -56,7 +57,7 @@ NaClProcessHost::NaClProcessHost(const std::wstring& url) reply_msg_(NULL), internal_(new NaClInternal()), running_on_wow64_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) { + ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { set_name(WideToUTF16Hack(url)); #if defined(OS_WIN) running_on_wow64_ = (base::win::OSInfo::GetInstance()->wow64_status() == @@ -263,8 +264,8 @@ void NaClProcessHost::OnProcessLaunched() { irt_path = plugin_dir.Append(GetIrtLibraryFilename()); } - base::FileUtilProxy::CreateOrOpenCallback* callback = - callback_factory_.NewCallback(&NaClProcessHost::OpenIrtFileDone); + base::FileUtilProxy::CreateOrOpenCallback callback = + base::Bind(&NaClProcessHost::OpenIrtFileDone, weak_factory_.GetWeakPtr()); if (!base::FileUtilProxy::CreateOrOpen( BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE), irt_path, diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h index a6fd8b2..59f4f50 100644 --- a/chrome/browser/nacl_host/nacl_process_host.h +++ b/chrome/browser/nacl_host/nacl_process_host.h @@ -11,7 +11,7 @@ #include "base/file_path.h" #include "base/file_util_proxy.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_callback_factory.h" +#include "base/memory/weak_ptr.h" #include "chrome/common/nacl_types.h" #include "content/browser/browser_child_process_host.h" @@ -76,7 +76,7 @@ class NaClProcessHost : public BrowserChildProcessHost { // Windows platform flag bool running_on_wow64_; - base::ScopedCallbackFactory<NaClProcessHost> callback_factory_; + base::WeakPtrFactory<NaClProcessHost> weak_factory_; DISALLOW_COPY_AND_ASSIGN(NaClProcessHost); }; |