Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5860)

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 9979001: Attempt to load component extension favicon from the resources first. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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,21 @@
Profile* profile,
FaviconService::GetFaviconRequest* request,
const GURL& page_url) const {
+ // Before determining whether page_url is an extension url, we must handle
+ // overrides. This changes urls in |kChromeUIScheme| to extension urls, and
+ // allows to use ExtensionWebUI::GetFaviconForURL.
+ GURL url(page_url);
+ ExtensionWebUI::HandleChromeURLOverride(&url, profile);
+
// 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;

Powered by Google App Engine
This is Rietveld 408576698