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

chrome/browser/browser_about_handler.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/browser_about_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 62 matching lines @@
     // If the material design extensions page is enabled, it gets its own host.
     // Otherwise, it's handled by the uber settings page.
     if (base::FeatureList::IsEnabled(features::kMaterialDesignExtensions)) {
       host = chrome::kChromeUIExtensionsHost;
       path = url->path();
     } else {
       host = chrome::kChromeUIUberHost;
       path = chrome::kChromeUIExtensionsHost + url->path();
     }
   // Redirect chrome://settings/extensions (legacy URL).
-  } else if (host == chrome::kChromeUISettingsHost &&
+  } else if (host == content::kChromeUISettingsHost &&
              url->path() ==
                  std::string("/") + chrome::kDeprecatedExtensionsSubPage) {
     host = chrome::kChromeUIUberHost;
     path = chrome::kChromeUIExtensionsHost;
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
   // Redirect chrome://history.
   } else if (host == content::kChromeUIHistoryHost) {
 #if defined(OS_ANDROID)
     // TODO(twellington): remove this after native Android history launches.
     // See http://crbug.com/654071.
     if (!base::FeatureList::IsEnabled(features::kNativeAndroidHistoryManager)) {
       // On Android, redirect directly to chrome://history-frame since
       // uber page is unsupported.
       host = chrome::kChromeUIHistoryFrameHost;
     }
 #else
     // Material design history is handled on the top-level chrome://history
     // host.
     if (base::FeatureList::IsEnabled(features::kMaterialDesignHistory)) {
       host = content::kChromeUIHistoryHost;
       path = url->path();
     } else {
       host = chrome::kChromeUIUberHost;
       path = content::kChromeUIHistoryHost + url->path();
     }
 #endif
   // Redirect chrome://settings, unless MD settings is enabled.
-  } else if (host == chrome::kChromeUISettingsHost) {
+  } else if (host == content::kChromeUISettingsHost) {
     if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
       return true;  // Prevent further rewriting - this is a valid URL.
     } else if (::switches::SettingsWindowEnabled()) {
       host = chrome::kChromeUISettingsFrameHost;
     } else {
       host = chrome::kChromeUIUberHost;
-      path = chrome::kChromeUISettingsHost + url->path();
+      path = content::kChromeUISettingsHost + url->path();
     }
   // Redirect chrome://help, unless MD settings is enabled.
-  } else if (host == chrome::kChromeUIHelpHost) {
+  } else if (host == content::kChromeUIHelpHost) {
     if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
       return false;  // Handled in the HandleWebUI handler.
     } else if (::switches::SettingsWindowEnabled()) {
       host = chrome::kChromeUISettingsFrameHost;
       if (url->path().empty() || url->path() == "/")
-        path = chrome::kChromeUIHelpHost;
+        path = content::kChromeUIHelpHost;
     } else {
       host = chrome::kChromeUIUberHost;
-      path = chrome::kChromeUIHelpHost + url->path();
+      path = content::kChromeUIHelpHost + url->path();
     }
   }
 
   GURL::Replacements replacements;
   replacements.SetHostStr(host);
   if (!path.empty())
     replacements.SetPathStr(path);
   *url = url->ReplaceComponents(replacements);
 
   // Having re-written the URL, make the chrome: handler process it.
@@ skipping 10 matching lines @@
         FROM_HERE, base::Bind(&chrome::AttemptRestart));
     return true;
   } else if (base::LowerCaseEqualsASCII(spec, chrome::kChromeUIQuitURL)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&chrome::AttemptExit));
     return true;
   }
 
   return false;
 }