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

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

Issue 2000063004: MD Settings: fix favicon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | chrome/browser/ui/webui/options/options_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d12549be7741944c5953d0990fd84cfaa0be1c95..1bbf46d3669b86ab05cdc025d5b5b61b08f149ea 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -47,6 +47,7 @@
#include "chrome/browser/ui/webui/predictors/predictors_ui.h"
#include "chrome/browser/ui/webui/profiler_ui.h"
#include "chrome/browser/ui/webui/settings/md_settings_ui.h"
+#include "chrome/browser/ui/webui/settings_utils.h"
#include "chrome/browser/ui/webui/signin/md_user_manager_ui.h"
#include "chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h"
#include "chrome/browser/ui/webui/signin_internals_ui.h"
@@ -761,10 +762,11 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
if (page_url.host() == chrome::kChromeUIDownloadsHost)
return MdDownloadsUI::GetFaviconResourceBytes(scale_factor);
- // Android doesn't use the Options pages.
+ // Android doesn't use the Options/Settings pages.
if (page_url.host() == chrome::kChromeUISettingsHost ||
- page_url.host() == chrome::kChromeUISettingsFrameHost)
- return options::OptionsUI::GetFaviconResourceBytes(scale_factor);
+ page_url.host() == chrome::kChromeUISettingsFrameHost ||
+ page_url.host() == chrome::kChromeUIMdSettingsHost)
+ return settings_utils::GetFaviconResourceBytes(scale_factor);
#if defined(ENABLE_EXTENSIONS)
if (page_url.host() == chrome::kChromeUIExtensionsHost ||
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options/options_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698