diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 20:19:57 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 20:19:57 +0000 |
| commit | 790879f7d6faea44ef0d13c2f7b44fe74edafa5e (patch) | |
| tree | 6d0210a7594a265ba97425289f0a0ac44aabfb62 /chrome/browser/favicon_service.h | |
| parent | 36ea6c6f047abed672aa9af4f3071a7364142d64 (diff) | |
| download | chromium_src-790879f7d6faea44ef0d13c2f7b44fe74edafa5e.zip chromium_src-790879f7d6faea44ef0d13c2f7b44fe74edafa5e.tar.gz chromium_src-790879f7d6faea44ef0d13c2f7b44fe74edafa5e.tar.bz2 | |
Change so that the extension favicon is read on the UI thread since extension objects should only be accessed on the UI thread.
This also fixes erg's todo to make favicons use RefCountedMemory instead of RefCountedBytes in all places.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/1028001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon_service.h')
| -rw-r--r-- | chrome/browser/favicon_service.h | 15 |
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. |