summaryrefslogtreecommitdiffstats
path: root/chrome/browser/favicon_service.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/favicon_service.h')
-rw-r--r--chrome/browser/favicon_service.h15
1 files changed, 5 insertions, 10 deletions
diff --git a/chrome/browser/favicon_service.h b/chrome/browser/favicon_service.h
index 3cc2880..a7b500c 100644
--- a/chrome/browser/favicon_service.h
+++ b/chrome/browser/favicon_service.h
@@ -38,11 +38,11 @@ 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 Callback5<Handle, // handle
- bool, // know_favicon
- scoped_refptr<RefCountedBytes>, // data
- bool, // expired
- GURL>::Type // url of the favicon
+ typedef Callback5<Handle, // handle
+ bool, // know_favicon
+ scoped_refptr<RefCountedMemory>, // data
+ bool, // expired
+ GURL>::Type // url of the favicon
FaviconDataCallback;
typedef CancelableRequest<FaviconDataCallback> GetFaviconRequest;
@@ -91,11 +91,6 @@ class FaviconService : public CancelableRequestProvider,
~FaviconService() {}
- // This is used to get the favicon for DOMUI on the file thread since these
- // might be loaded from disk.
- void GetFaviconForDOMUIOnFileThread(GetFaviconRequest* request,
- const GURL& page_url);
-
Profile* profile_;
// Helper to forward an empty result if we cannot get the history service.