diff options
Diffstat (limited to 'chrome/browser/favicon/favicon_service.h')
| -rw-r--r-- | chrome/browser/favicon/favicon_service.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h index 4fb313b..2062239 100644 --- a/chrome/browser/favicon/favicon_service.h +++ b/chrome/browser/favicon/favicon_service.h @@ -8,7 +8,7 @@ #include <vector> -#include "base/callback.h" +#include "base/callback_old.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" #include "base/task.h" @@ -40,10 +40,9 @@ class FaviconService : public CancelableRequestProvider { // opposed to not knowing anything). |expired| will be set to true if we // refreshed the favicon "too long" ago and should be updated if the page // is visited again. - typedef base::Callback< - void(Handle, // handle - history::FaviconData)> // the type of favicon - FaviconDataCallback; + typedef Callback2<Handle, // handle + history::FaviconData>::Type // the type of favicon + FaviconDataCallback; typedef CancelableRequest<FaviconDataCallback> GetFaviconRequest; @@ -53,7 +52,7 @@ class FaviconService : public CancelableRequestProvider { Handle GetFavicon(const GURL& icon_url, history::IconType icon_type, CancelableRequestConsumerBase* consumer, - const FaviconDataCallback& callback); + FaviconDataCallback* callback); // Fetches the |icon_type| of favicon at |icon_url|, sending the results to // the given |callback|. If the favicon has previously been set via @@ -64,7 +63,7 @@ class FaviconService : public CancelableRequestProvider { const GURL& icon_url, history::IconType icon_type, CancelableRequestConsumerBase* consumer, - const FaviconDataCallback& callback); + FaviconDataCallback* callback); // Requests any |icon_types| of favicon for a web page URL. |consumer| is // notified when the bits have been fetched. |icon_types| can be any @@ -77,7 +76,7 @@ class FaviconService : public CancelableRequestProvider { Handle GetFaviconForURL(const GURL& page_url, int icon_types, CancelableRequestConsumerBase* consumer, - const FaviconDataCallback& callback); + FaviconDataCallback* callback); // Marks all types of favicon for the page as being out of date. void SetFaviconOutOfDateForPage(const GURL& page_url); |