diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-08 18:14:24 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-08 18:14:24 +0000 |
| commit | bbdd29869de3ae2de2536f780eccb0da99da7570 (patch) | |
| tree | c897b86ed22da6ca6a0b1ba271f7c2ea07d2805d /chrome/browser/extensions | |
| parent | f5da41d2fa5331d208d13cb6e9d0fb6790a52fc6 (diff) | |
| download | chromium_src-bbdd29869de3ae2de2536f780eccb0da99da7570.zip chromium_src-bbdd29869de3ae2de2536f780eccb0da99da7570.tar.gz chromium_src-bbdd29869de3ae2de2536f780eccb0da99da7570.tar.bz2 | |
base::Bind: Complete cleanup of history/.
Previous version reverted; linux touch build now fixed.
TBR=csilv
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8205024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_history_api.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_web_ui.cc | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_history_api.cc b/chrome/browser/extensions/extension_history_api.cc index 3f4dda7..e6c6a8a 100644 --- a/chrome/browser/extensions/extension_history_api.cc +++ b/chrome/browser/extensions/extension_history_api.cc @@ -272,7 +272,8 @@ bool SearchHistoryFunction::RunAsyncImpl() { HistoryService* hs = profile()->GetHistoryService(Profile::EXPLICIT_ACCESS); hs->QueryHistory(search_text, options, &cancelable_consumer_, - NewCallback(this, &SearchHistoryFunction::SearchComplete)); + base::Bind(&SearchHistoryFunction::SearchComplete, + base::Unretained(this))); return true; } @@ -349,7 +350,8 @@ bool DeleteRangeHistoryFunction::RunAsyncImpl() { begin_time, end_time, &cancelable_consumer_, - NewCallback(this, &DeleteRangeHistoryFunction::DeleteComplete)); + base::Bind(&DeleteRangeHistoryFunction::DeleteComplete, + base::Unretained(this))); return true; } @@ -366,7 +368,8 @@ bool DeleteAllHistoryFunction::RunAsyncImpl() { base::Time::UnixEpoch(), // From the beginning of the epoch. base::Time::Now(), // To the current time. &cancelable_consumer_, - NewCallback(this, &DeleteAllHistoryFunction::DeleteComplete)); + base::Bind(&DeleteAllHistoryFunction::DeleteComplete, + base::Unretained(this))); return true; } diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index ccb77d5..eeca442 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -108,9 +108,7 @@ class ExtensionWebUIImageLoadingTracker : public ImageLoadingTracker::Observer { favicon.known_icon = icon_data.get() != NULL && icon_data->size() > 0; favicon.image_data = icon_data; favicon.icon_type = history::FAVICON; - request_->ForwardResultAsync( - FaviconService::FaviconDataCallback::TupleType(request_->handle(), - favicon)); + request_->ForwardResultAsync(request_->handle(), favicon); delete this; } |