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

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

Issue 2450623002: [MD Bookmarks] Add skeleton for Material Design Bookmarks (Closed)
Patch Set: Created 4 years, 2 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
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index ac57a4128795a205acd80b7335dd6d5b6fdb348c..c77e9ebab491da40d7eaac636dad73f6ebe1aaca 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -714,7 +714,8 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
// All extensions but the bookmark manager get their favicon from the icons
// part of the manifest.
if (url.SchemeIs(extensions::kExtensionScheme) &&
- url.host() != extension_misc::kBookmarkManagerId) {
+ url.host() != extension_misc::kBookmarkManagerId &&
+ url.host() != extension_misc::kMDBookmarkManagerId) {
ExtensionWebUI::GetFaviconForURL(profile, url, callback);
return;
}
@@ -778,8 +779,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
#if !defined(OS_ANDROID) // Bookmarks are part of NTP on Android.
// The bookmark manager is a chrome extension, so we have to check for it
// before we check for extension scheme.
- if (page_url.host() == extension_misc::kBookmarkManagerId)
+ if (page_url.host() == extension_misc::kBookmarkManagerId ||
+ page_url.host() == extension_misc::kMDBookmarkManagerId) {
return BookmarksUI::GetFaviconResourceBytes(scale_factor);
+ }
// The extension scheme is handled in GetFaviconForURL.
if (page_url.SchemeIs(extensions::kExtensionScheme)) {

Powered by Google App Engine
This is Rietveld 408576698