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

Unified Diff: ui/webui/resources/js/util.js

Issue 1938063002: WebUI: Fix favicon URL regression. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit. Created 4 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
« no previous file with comments | « chrome/test/data/webui/util_test.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/webui/resources/js/util.js
diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
index 0836f68034b255c95757e6cb7ac090005589e524..5dcfc92631907c66512689dc514788857a7a4fb7 100644
--- a/ui/webui/resources/js/util.js
+++ b/ui/webui/resources/js/util.js
@@ -345,13 +345,11 @@ function getFaviconImageSet(url, opt_size, opt_type) {
var size = opt_size || 16;
var type = opt_type || 'favicon';
- // Note: Literals 'iconurl' and 'origin' must match |kIconURLParameter| and
- // |kOriginParameter| in components/favicon_base/favicon_url_parser.cc.
- var urlType = FAVICON_URL_REGEX.test(url) ? 'iconurl' : 'origin';
-
return imageset(
'chrome://' + type + '/size/' + size + '@scalefactorx/' +
- urlType + '/' + url);
+ // Note: Literal 'iconurl' must match |kIconURLParameter| in
+ // components/favicon_base/favicon_url_parser.cc.
+ (FAVICON_URL_REGEX.test(url) ? 'iconurl/' : '') + url);
}
/**
« no previous file with comments | « chrome/test/data/webui/util_test.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698