diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 20:44:22 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 20:44:22 +0000 |
| commit | bb04c4ed964981493b8727cf67257d2ad6e8128b (patch) | |
| tree | 0da5525bc43e817bbbd5dc0b691dfd6cdbbe322a /chrome_frame/urlmon_url_request_private.h | |
| parent | 94dde4b7d804f3e8c92fbbaf56251717f9a2cc40 (diff) | |
| download | chromium_src-bb04c4ed964981493b8727cf67257d2ad6e8128b.zip chromium_src-bb04c4ed964981493b8727cf67257d2ad6e8128b.tar.gz chromium_src-bb04c4ed964981493b8727cf67257d2ad6e8128b.tar.bz2 | |
base::Bind: Convert chrome_frame/.
BUG=none
TEST=none
R=csilv@chromium.org
Review URL: http://codereview.chromium.org/8555001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_url_request_private.h')
| -rw-r--r-- | chrome_frame/urlmon_url_request_private.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/urlmon_url_request_private.h b/chrome_frame/urlmon_url_request_private.h index ad4a691..1ce650b 100644 --- a/chrome_frame/urlmon_url_request_private.h +++ b/chrome_frame/urlmon_url_request_private.h @@ -38,9 +38,9 @@ class UrlmonUrlRequest // Used from "DownloadRequestInHost". // Callback will be invoked either right away (if operation is finished) or // from inside ::OnStopBinding() when it is safe to reuse the bind_context. - typedef Callback4<IMoniker*, IBindCtx*, IStream*, const char*>::Type + typedef base::Callback<void(IMoniker*, IBindCtx*, IStream*, const char*)> TerminateBindCallback; - void TerminateBind(TerminateBindCallback* callback); + void TerminateBind(const TerminateBindCallback& callback); // Parent Window for UrlMon error dialogs void set_parent_window(HWND parent_window) { @@ -118,7 +118,7 @@ class UrlmonUrlRequest } bool terminate_requested() const { - return terminate_bind_callback_.get() != NULL; + return !terminate_bind_callback_.is_null(); } std::string response_headers() { @@ -245,7 +245,7 @@ class UrlmonUrlRequest // Set to true if the ChromeFrame instance is running in privileged mode. bool privileged_mode_; bool pending_; - scoped_ptr<TerminateBindCallback> terminate_bind_callback_; + TerminateBindCallback terminate_bind_callback_; std::string response_headers_; // Defaults to true and indicates whether we want to keep the original // transaction alive when we receive the last data notification from |