Remove RELAUNCH_MODE_, kRelaunchMode, et al

Used to relaunch in metro/desktop, no longer needed.

R=sky@chromium.org
BUG=558054

Review URL: https://codereview.chromium.org/1820513002

Cr-Commit-Position: refs/heads/master@{#382125}

7 files changed, 2 insertions, 100 deletions

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 73855a5..685711e 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -774,12 +774,6 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   registry->RegisterBooleanPref(prefs::kEulaAccepted, false);
 #endif  // defined(OS_CHROMEOS) || defined(OS_ANDROID)
-#if defined(OS_WIN)
-  if (base::win::GetVersion() >= base::win::VERSION_WIN7) {
-    registry->RegisterStringPref(prefs::kRelaunchMode,
-                                 upgrade_util::kRelaunchModeDefault);
-  }
-#endif
 
   // TODO(brettw,*): this comment about ResourceBundle was here since
   // initial commit.  This comment seems unrelated, bit-rotten and
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index c3ff7aa..fc6d821 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -69,11 +69,6 @@ namespace {
 // Whether the browser is trying to quit (e.g., Quit chosen from menu).
 bool g_trying_to_quit = false;
 
-#if defined(OS_WIN)
-upgrade_util::RelaunchMode g_relaunch_mode =
-    upgrade_util::RELAUNCH_MODE_DEFAULT;
-#endif
-
 Time* g_shutdown_started = nullptr;
 ShutdownType g_shutdown_type = NOT_VALID;
 int g_shutdown_num_processes;
@@ -186,15 +181,6 @@ bool ShutdownPreThreadsStop() {
     restart_last_session =
         prefs->GetBoolean(prefs::kRestartLastSessionOnShutdown);
     prefs->ClearPref(prefs::kRestartLastSessionOnShutdown);
-#if defined(OS_WIN)
-    if (restart_last_session) {
-      if (prefs->HasPrefPath(prefs::kRelaunchMode)) {
-        g_relaunch_mode = upgrade_util::RelaunchModeStringToEnum(
-            prefs->GetString(prefs::kRelaunchMode));
-        prefs->ClearPref(prefs::kRelaunchMode);
-      }
-    }
-#endif
   }
 
   prefs->CommitPendingWrite();
@@ -254,9 +240,7 @@ void ShutdownPostThreadsStop(bool restart_last_session) {
         new_cl->AppendSwitch(it.first);
     }
 
-#if defined(OS_WIN)
-    upgrade_util::RelaunchChromeWithMode(*new_cl.get(), g_relaunch_mode);
-#elif defined(OS_POSIX)
+#if defined(OS_POSIX) || defined(OS_WIN)
     upgrade_util::RelaunchChromeBrowser(*new_cl.get());
 #endif  // defined(OS_WIN)
 
diff --git a/chrome/browser/first_run/upgrade_util.h b/chrome/browser/first_run/upgrade_util.h
index 6f01be8..93e1c6d 100644
--- a/chrome/browser/first_run/upgrade_util.h
+++ b/chrome/browser/first_run/upgrade_util.h
@@ -25,30 +25,6 @@ namespace upgrade_util {
 // launched, returns false.
 bool RelaunchChromeBrowser(const base::CommandLine& command_line);
 
-#if defined(OS_WIN)
-
-extern const char kRelaunchModeMetro[];
-extern const char kRelaunchModeDesktop[];
-extern const char kRelaunchModeDefault[];
-
-enum RelaunchMode {
-  RELAUNCH_MODE_METRO = 0,
-  RELAUNCH_MODE_DESKTOP = 1,
-  // Default mode indicates caller is not sure which mode to launch.
-  RELAUNCH_MODE_DEFAULT = 2,
-};
-
-std::string RelaunchModeEnumToString(const RelaunchMode& relaunch_mode);
-
-RelaunchMode RelaunchModeStringToEnum(const std::string& relaunch_mode);
-
-// Like RelaunchChromeBrowser() but for Windows 8 it will read pref and restart
-// chrome accordingly in desktop or metro mode.
-bool RelaunchChromeWithMode(const base::CommandLine& command_line,
-                            const RelaunchMode& relaunch_mode);
-
-#endif  // defined(OS_WIN)
-
 #if !defined(OS_MACOSX)
 
 void SetNewCommandLine(base::CommandLine* new_command_line);
diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
index 70a0466..9d5402a 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc
@@ -80,35 +80,7 @@ bool InvokeGoogleUpdateForRename() {
 
 namespace upgrade_util {
 
-const char kRelaunchModeMetro[] = "relaunch.mode.metro";
-const char kRelaunchModeDesktop[] = "relaunch.mode.desktop";
-const char kRelaunchModeDefault[] = "relaunch.mode.default";
-
-// TODO(shrikant): Have a map/array to quickly map enum to strings.
-std::string RelaunchModeEnumToString(const RelaunchMode relaunch_mode) {
-  if (relaunch_mode == RELAUNCH_MODE_METRO)
-    return kRelaunchModeMetro;
-
-  if (relaunch_mode == RELAUNCH_MODE_DESKTOP)
-    return kRelaunchModeDesktop;
-
-  // For the purpose of code flow, even in case of wrong value we will
-  // return default re-launch mode.
-  return kRelaunchModeDefault;
-}
-
-RelaunchMode RelaunchModeStringToEnum(const std::string& relaunch_mode) {
-  if (relaunch_mode == kRelaunchModeMetro)
-    return RELAUNCH_MODE_METRO;
-
-  if (relaunch_mode == kRelaunchModeDesktop)
-    return RELAUNCH_MODE_DESKTOP;
-
-  return RELAUNCH_MODE_DEFAULT;
-}
-
-bool RelaunchChromeHelper(const base::CommandLine& command_line,
-                          const RelaunchMode& relaunch_mode) {
+bool RelaunchChromeBrowser(const base::CommandLine& command_line) {
   base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
@@ -125,15 +97,6 @@ bool RelaunchChromeHelper(const base::CommandLine& command_line,
       .IsValid();
 }
 
-bool RelaunchChromeBrowser(const base::CommandLine& command_line) {
-  return RelaunchChromeHelper(command_line, RELAUNCH_MODE_DEFAULT);
-}
-
-bool RelaunchChromeWithMode(const base::CommandLine& command_line,
-                            const RelaunchMode& relaunch_mode) {
-  return RelaunchChromeHelper(command_line, relaunch_mode);
-}
-
 bool IsUpdatePendingRestart() {
   base::FilePath new_chrome_exe;
   if (!GetNewerChromeFile(&new_chrome_exe))
diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index d92d76c..7723014 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -599,10 +599,6 @@ class RestartTest : public BetterSessionRestoreTest {
       content::BrowserContext::SaveSessionState(browser->profile());
     PrefService* pref_service = g_browser_process->local_state();
     pref_service->SetBoolean(prefs::kWasRestarted, true);
-#if defined(OS_WIN)
-    if (pref_service->HasPrefPath(prefs::kRelaunchMode))
-      pref_service->ClearPref(prefs::kRelaunchMode);
-#endif
   }
 
  private:
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index c48a381..a5bb63b 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1450,13 +1450,6 @@ const char kRestartLastSessionOnShutdown[] = "restart.last.session.on.shutdown";
 const char kWasRestarted[] = "was.restarted";
 #endif
 
-#if defined(OS_WIN)
-// Preference to be used while relaunching Chrome. This preference dictates if
-// Chrome should be launched in Metro or Desktop mode.
-// For more info take a look at ChromeRelaunchMode enum.
-const char kRelaunchMode[] = "relaunch.mode";
-#endif
-
 // Whether Extensions are enabled.
 const char kDisableExtensions[] = "extensions.disabled";
 
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index a1fffed..c7abae5 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -511,10 +511,6 @@ extern const char kRestartLastSessionOnShutdown[];
 extern const char kWasRestarted[];
 #endif
 
-#if defined(OS_WIN)
-extern const char kRelaunchMode[];
-#endif
-
 extern const char kDisableExtensions[];
 extern const char kDisablePluginFinder[];