MD Settings: enhance restarting Chrome + interacting w/ session restore

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 425 matching lines @@
       base::FeatureList::IsEnabled(features::kMaterialDesignExtensions)) {
     return &NewWebUI<extensions::ExtensionsUI>;
   }
   // Material Design history is on its own host, rather than on an Uber page.
   if (base::FeatureList::IsEnabled(features::kMaterialDesignHistory) &&
       url.host_piece() == content::kChromeUIHistoryHost) {
     return &NewWebUI<MdHistoryUI>;
   }
   // Material Design Settings gets its own host, if enabled.
   if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings) &&
-      url.host_piece() == chrome::kChromeUISettingsHost) {
+      url.host_piece() == content::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 &&
+      (url.host_piece() == content::kChromeUISettingsHost &&
        ::switches::SettingsWindowEnabled())) {
     return &NewWebUI<options::OptionsUI>;
   }
   if (url.host_piece() == chrome::kChromeUISyncFileSystemInternalsHost)
     return &NewWebUI<SyncFileSystemInternalsUI>;
   if (url.host_piece() == chrome::kChromeUISystemInfoHost)
     return &NewWebUI<SystemInfoUI>;
   // Uber frame is not used on Android.
   if (url.host_piece() == chrome::kChromeUIUberFrameHost)
     return &NewWebUI<UberFrameUI>;
@@ skipping 346 matching lines @@
 
   // Flash is not available on android.
   if (page_url.host_piece() == chrome::kChromeUIFlashHost)
     return FlashUI::GetFaviconResourceBytes(scale_factor);
 
   // Android uses the native download manager.
   if (page_url.host_piece() == chrome::kChromeUIDownloadsHost)
     return MdDownloadsUI::GetFaviconResourceBytes(scale_factor);
 
   // Android doesn't use the Options/Settings pages.
-  if (page_url.host_piece() == chrome::kChromeUISettingsHost ||
+  if (page_url.host_piece() == content::kChromeUISettingsHost ||
       page_url.host_piece() == chrome::kChromeUISettingsFrameHost ||
       page_url.host_piece() == chrome::kChromeUIMdSettingsHost)
     return settings_utils::GetFaviconResourceBytes(scale_factor);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   if (page_url.host_piece() == chrome::kChromeUIExtensionsHost ||
       page_url.host_piece() == chrome::kChromeUIExtensionsFrameHost)
     return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor);
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 #endif  // !defined(OS_ANDROID)
 
   return NULL;
 }