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 ad04d3c07d5a9a77afa42850487bc6e81a236264..dfc3262b1d0e34c01ebea36f6400ba69edbbfb04 100644 |
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
@@ -423,8 +423,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, |
return &NewWebUI<IdentityInternalsUI>; |
if (url.host_piece() == chrome::kChromeUINewTabHost) |
return &NewWebUI<NewTabUI>; |
- if (url.host_piece() == chrome::kChromeUIMdSettingsHost) |
+ if (url.host_piece() == chrome::kChromeUISettingsHost || |
+ url.host_piece() == chrome::kChromeUIMdSettingsHost) { |
return &NewWebUI<settings::MdSettingsUI>; |
+ } |
// If the material design extensions page is enabled, it gets its own host. |
// Otherwise, it's handled by the uber settings page. |
if (url.host_piece() == chrome::kChromeUIExtensionsHost && |
@@ -433,18 +435,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, |
} |
if (url.host_piece() == chrome::kChromeUIHistoryHost) |
return &NewWebUI<MdHistoryUI>; |
- // Material Design Settings gets its own host, if enabled. |
- if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings) && |
- url.host_piece() == chrome::kChromeUISettingsHost) { |
- return &NewWebUI<settings::MdSettingsUI>; |
- } |
- // Settings are implemented with native UI elements on Android. |
- // Handle chrome://settings if settings in a window is enabled. |
- if (url.host_piece() == chrome::kChromeUISettingsFrameHost || |
- (url.host_piece() == chrome::kChromeUISettingsHost && |
- ::switches::SettingsWindowEnabled())) { |
- return &NewWebUI<options::OptionsUI>; |
- } |
if (url.host_piece() == chrome::kChromeUISyncFileSystemInternalsHost) |
return &NewWebUI<SyncFileSystemInternalsUI>; |
if (url.host_piece() == chrome::kChromeUISystemInfoHost) |