summaryrefslogtreecommitdiffstats
path: root/chrome/browser/icon_manager.h
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-03 07:59:27 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-03 07:59:27 +0000
commita528f84cf7958fde2b934bd4fea20d62fbf91093 (patch)
treeea14e5261c2d5cf3d1691fe8b77722296f2707bb /chrome/browser/icon_manager.h
parentb6c7f73e82ab83de4445fe387f6e05ca1aa9f08f (diff)
downloadchromium_src-a528f84cf7958fde2b934bd4fea20d62fbf91093.zip
chromium_src-a528f84cf7958fde2b934bd4fea20d62fbf91093.tar.gz
chromium_src-a528f84cf7958fde2b934bd4fea20d62fbf91093.tar.bz2
Add interface to CancelableRequest that allows use of base::Callback<>.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8068013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_manager.h')
-rw-r--r--chrome/browser/icon_manager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h
index 3b3b594..3622203 100644
--- a/chrome/browser/icon_manager.h
+++ b/chrome/browser/icon_manager.h
@@ -71,7 +71,7 @@ class IconManager : public IconLoader::Delegate,
IconLoader::IconSize size);
typedef CancelableRequestProvider::Handle Handle;
- typedef Callback2<Handle, gfx::Image*>::Type IconRequestCallback;
+ typedef base::Callback<void(Handle, gfx::Image*)> IconRequestCallback;
// Asynchronous call to lookup and return the icon associated with file. The
// work is done on the file thread, with the callbacks running on the UI
@@ -82,7 +82,7 @@ class IconManager : public IconLoader::Delegate,
Handle LoadIcon(const FilePath& file_name,
IconLoader::IconSize size,
CancelableRequestConsumerBase* consumer,
- IconRequestCallback* callback);
+ const IconRequestCallback& callback);
// IconLoader::Delegate interface.
virtual bool OnImageLoaded(IconLoader* source, gfx::Image* result);