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

chrome/browser/ui/webui/uber/uber_ui.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/uber/uber_ui.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 39 matching lines @@
   source->AddResourcePath("uber_utils.js", IDR_UBER_UTILS_JS);
   source->SetDefaultResource(IDR_UBER_HTML);
   source->OverrideContentSecurityPolicyChildSrc("child-src chrome:;");
 
   // Hack alert: continue showing "Loading..." until a real title is set.
   source->AddLocalizedString("pageTitle", IDS_TAB_LOADING_TITLE);
 
   source->AddString("extensionsFrameURL", chrome::kChromeUIExtensionsFrameURL);
   source->AddString("extensionsHost", chrome::kChromeUIExtensionsHost);
   source->AddString("helpFrameURL", chrome::kChromeUIHelpFrameURL);
-  source->AddString("helpHost", chrome::kChromeUIHelpHost);
+  source->AddString("helpHost", content::kChromeUIHelpHost);
   source->AddString("historyFrameURL", chrome::kChromeUIHistoryFrameURL);
   source->AddString("historyHost", content::kChromeUIHistoryHost);
   source->AddString("settingsFrameURL", chrome::kChromeUISettingsFrameURL);
-  source->AddString("settingsHost", chrome::kChromeUISettingsHost);
+  source->AddString("settingsHost", content::kChromeUISettingsHost);
 
   return source;
 }
 
 // Determines whether the user has an active extension of the given type.
 bool HasExtensionType(content::BrowserContext* browser_context,
                       const std::string& extension_type) {
   const extensions::ExtensionSet& extension_set =
       extensions::ExtensionRegistry::Get(browser_context)->enabled_extensions();
   for (extensions::ExtensionSet::const_iterator iter = extension_set.begin();
@@ skipping 25 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 
   source->AddBoolean("hideExtensions",
       base::FeatureList::IsEnabled(features::kMaterialDesignExtensions));
   source->AddBoolean("hideSettingsAndHelp",
       ::switches::SettingsWindowEnabled() ||
       base::FeatureList::IsEnabled(features::kMaterialDesignSettings));
   source->AddString("extensionsHost", chrome::kChromeUIExtensionsHost);
   source->AddLocalizedString("extensionsDisplayName",
                              IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE);
-  source->AddString("helpHost", chrome::kChromeUIHelpHost);
+  source->AddString("helpHost", content::kChromeUIHelpHost);
   source->AddLocalizedString("helpDisplayName", IDS_ABOUT_TITLE);
   source->AddString("historyHost", content::kChromeUIHistoryHost);
   source->AddLocalizedString("historyDisplayName", IDS_HISTORY_TITLE);
-  source->AddString("settingsHost", chrome::kChromeUISettingsHost);
+  source->AddString("settingsHost", content::kChromeUISettingsHost);
   source->AddLocalizedString("settingsDisplayName", IDS_SETTINGS_TITLE);
   bool overrides_history =
       HasExtensionType(browser_context, content::kChromeUIHistoryHost);
   source->AddString("overridesHistory", overrides_history ? "yes" : "no");
   source->AddBoolean("hideHistory", base::FeatureList::IsEnabled(
                                         features::kMaterialDesignHistory) &&
                                         !overrides_history);
 
   source->DisableDenyXFrameOptions();
   source->OverrideContentSecurityPolicyChildSrc("child-src chrome:;");
@@ skipping 41 matching lines @@
     // CreateWebUIControllerForURL is called there's always a RenderFrame
     // and the logging happens there.
     subframe_logger_ =
         base::MakeUnique<SubframeLogger>(web_ui->GetWebContents());
   }
   content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
                                 CreateUberHTMLSource());
 
   RegisterSubpage(chrome::kChromeUIExtensionsFrameURL,
                   chrome::kChromeUIExtensionsHost);
-  RegisterSubpage(chrome::kChromeUIHelpFrameURL,
-                  chrome::kChromeUIHelpHost);
+  RegisterSubpage(chrome::kChromeUIHelpFrameURL, content::kChromeUIHelpHost);
   RegisterSubpage(chrome::kChromeUIHistoryFrameURL,
                   content::kChromeUIHistoryHost);
   RegisterSubpage(chrome::kChromeUISettingsFrameURL,
-                  chrome::kChromeUISettingsHost);
+                  content::kChromeUISettingsHost);
   RegisterSubpage(chrome::kChromeUIUberFrameURL,
                   chrome::kChromeUIUberHost);
 }
 
 UberUI::~UberUI() {
 }
 
 void UberUI::RegisterSubpage(const std::string& page_url,
                              const std::string& page_host) {
   sub_uis_[page_url] = web_ui()->GetWebContents()->CreateSubframeWebUI(
@@ skipping 59 matching lines @@
   // opens the default history page if one is uninstalled or disabled.
   UpdateHistoryNavigation(web_ui());
 }
 
 void UberFrameUI::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension,
     extensions::UnloadedExtensionInfo::Reason reason) {
   UpdateHistoryNavigation(web_ui());
 }