diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 20:01:04 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 20:01:04 +0000 |
| commit | 4b91f1fb5dbbf8a28714238727ccb75a295b8064 (patch) | |
| tree | 2496d516b60373439a4bcf21c5e94f08bdb40074 /chrome/browser/favicon_service.cc | |
| parent | 54ee6fa1835a977eea259b7a638480f5cb34ed6f (diff) | |
| download | chromium_src-4b91f1fb5dbbf8a28714238727ccb75a295b8064.zip chromium_src-4b91f1fb5dbbf8a28714238727ccb75a295b8064.tar.gz chromium_src-4b91f1fb5dbbf8a28714238727ccb75a295b8064.tar.bz2 | |
Extensions: Resize favicons to 16x16.
This changes the ExtensionDOMUI favicon loading to use a ImageLoadingTracker which handles reading the file in the correct thread as well as resizing it.
BUG=47964
TEST=Install one of the extensions in the bug. Open the options page for the extension. The icon in the tab should be 16x16 pixels.
Review URL: http://codereview.chromium.org/2918007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon_service.cc')
| -rw-r--r-- | chrome/browser/favicon_service.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/favicon_service.cc b/chrome/browser/favicon_service.cc index 0c24c80..94baaf7 100644 --- a/chrome/browser/favicon_service.cc +++ b/chrome/browser/favicon_service.cc @@ -51,12 +51,8 @@ FaviconService::Handle FaviconService::GetFaviconForURL( AddRequest(request, consumer); FaviconService::Handle handle = request->handle(); if (page_url.SchemeIs(chrome::kChromeUIScheme) || - page_url.SchemeIs(chrome::kExtensionScheme)) { - scoped_refptr<RefCountedMemory> icon_data = - DOMUIFactory::GetFaviconResourceBytes(profile_, page_url); - bool know_icon = icon_data.get() != NULL && icon_data->size() > 0; - request->ForwardResultAsync(FaviconDataCallback::TupleType(handle, - know_icon, icon_data, false, GURL())); + page_url.SchemeIs(chrome::kExtensionScheme)) { + DOMUIFactory::GetFaviconForURL(profile_, request, page_url); } else { HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS); if (hs) |