Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
=================================================================== |
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc (revision 130900) |
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc (working copy) |
@@ -422,15 +422,17 @@ |
Profile* profile, |
FaviconService::GetFaviconRequest* request, |
const GURL& page_url) const { |
+ GURL url(page_url); |
+ ExtensionWebUI::HandleChromeURLOverride(&url, profile); |
James Hawkins
2012/04/06 04:45:25
This needs an explanatory comment.
dgozman
2012/04/06 11:15:39
Done.
|
// All extensions but the bookmark manager get their favicon from the icons |
// part of the manifest. |
- if (page_url.SchemeIs(chrome::kExtensionScheme) && |
- page_url.host() != extension_misc::kBookmarkManagerId) { |
- ExtensionWebUI::GetFaviconForURL(profile, request, page_url); |
+ if (url.SchemeIs(chrome::kExtensionScheme) && |
+ url.host() != extension_misc::kBookmarkManagerId) { |
+ ExtensionWebUI::GetFaviconForURL(profile, request, url); |
} else { |
history::FaviconData favicon; |
favicon.image_data = scoped_refptr<RefCountedMemory>( |
- GetFaviconResourceBytes(page_url)); |
+ GetFaviconResourceBytes(url)); |
favicon.known_icon = favicon.image_data.get() != NULL && |
favicon.image_data->size() > 0; |
favicon.icon_type = history::FAVICON; |