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

chrome/browser/ui/chrome_pages.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/chrome_pages.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 #include "chrome/browser/ui/webui/site_settings_helper.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 #include "ui/base/window_open_disposition.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/win/enumerate_modules_model.h"
 #endif
 
@@ skipping 211 matching lines @@
   ShowSingletonTab(browser, GURL(kChromeUISlowURL));
 #endif
 }
 
 GURL GetSettingsUrl(const std::string& sub_page) {
   return GURL(std::string(kChromeUISettingsURL) + sub_page);
 }
 
 bool IsSettingsSubPage(const GURL& url, const std::string& sub_page) {
   return (url.SchemeIs(content::kChromeUIScheme) &&
-          (url.host_piece() == chrome::kChromeUISettingsHost ||
+          (url.host_piece() == content::kChromeUISettingsHost ||
            url.host_piece() == chrome::kChromeUISettingsFrameHost) &&
           url.path_piece() == "/" + sub_page);
 }
 
 bool IsTrustedPopupWindowWithScheme(const Browser* browser,
                                     const std::string& scheme) {
   if (!browser->is_type_popup() || !browser->is_trusted_source())
     return false;
   if (scheme.empty())  // Any trusted popup window
     return true;
@@ skipping 174 matching lines @@
       SigninManagerFactory::GetForProfile(original_profile);
   DCHECK(manager->IsSigninAllowed());
   if (manager->IsAuthenticated())
     ShowSettings(browser);
   else
     ShowBrowserSignin(browser, access_point);
 }
 #endif
 
 }  // namespace chrome