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

chrome/browser/ui/webui/uber/uber_ui.cc

Index: chrome/browser/ui/webui/uber/uber_ui.cc
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index 9ccff785fb2accb5ea42ad3fa0beb1fc09f64b63..6d9166ce327d77a989a7fda2cdb7f50d00b6b51f 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -57,11 +57,11 @@ content::WebUIDataSource* CreateUberHTMLSource() {
   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;
 }
@@ -107,11 +107,11 @@ content::WebUIDataSource* CreateUberFrameHTMLSource(
   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);
@@ -173,12 +173,11 @@ UberUI::UberUI(content::WebUI* web_ui) : WebUIController(web_ui) {
 
   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);
 }