Metro mode switching (chrome side)

chrome/browser/browser_shutdown.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_shutdown.h"
 
 #include <map>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 47 matching lines @@
 using content::BrowserThread;
 
 namespace browser_shutdown {
 
 // Whether the browser is trying to quit (e.g., Quit chosen from menu).
 bool g_trying_to_quit = false;
 
 // Whether the browser should quit without closing browsers.
 bool g_shutting_down_without_closing_browsers = false;
 
+#if defined(OS_WIN)
+// Whether the next restart should happen in the opposite mode; desktop or
+// metro mode. Windows 8 only.
+bool g_mode_switch = false;
+#endif
+
 Time* shutdown_started_ = NULL;
 ShutdownType shutdown_type_ = NOT_VALID;
 int shutdown_num_processes_;
 int shutdown_num_processes_slow_;
 
 const char kShutdownMsFile[] = "chrome_shutdown_ms.txt";
 
 void RegisterPrefs(PrefService* local_state) {
   local_state->RegisterIntegerPref(prefs::kShutdownType, NOT_VALID);
   local_state->RegisterIntegerPref(prefs::kShutdownNumProcesses, 0);
@@ skipping 62 matching lines @@
     prefs->SetInteger(prefs::kShutdownNumProcessesSlow,
                       shutdown_num_processes_slow_);
   }
 
   // Check local state for the restart flag so we can restart the session below.
   bool restart_last_session = false;
   if (prefs->HasPrefPath(prefs::kRestartLastSessionOnShutdown)) {
     restart_last_session =
         prefs->GetBoolean(prefs::kRestartLastSessionOnShutdown);
     prefs->ClearPref(prefs::kRestartLastSessionOnShutdown);
+#if defined(OS_WIN)
+    if (restart_last_session) {
+      if (prefs->HasPrefPath(prefs::kRestartSwitchMode))
+        g_mode_switch = prefs->GetBoolean(prefs::kRestartSwitchMode);
+        prefs->SetBoolean(prefs::kRestartSwitchMode, false);

[grt (UTC plus 2), 2012/09/05 01:40:51]

either de-indent this line, or put braces around the 159 - 160 block

[cpu_(ooo_6.6-7.5), 2012/09/05 22:20:07]

Good catch.

On 2012/09/05 01:40:51, grt wrote:

+    }
+#endif
   }
 
   prefs->CommitPendingWrite();
 
 #if defined(ENABLE_RLZ)
   // Cleanup any statics created by RLZ. Must be done before NotificationService
   // is destroyed.
   RLZTracker::CleanupRlz();
 #endif
 
@@ skipping 43 matching lines @@
     switches::RemoveSwitchesForAutostart(&switches);
     // Append the old switches to the new command line.
     for (std::map<std::string, CommandLine::StringType>::const_iterator i =
         switches.begin(); i != switches.end(); ++i) {
       CommandLine::StringType switch_value = i->second;
       if (!switch_value.empty())
         new_cl->AppendSwitchNative(i->first, i->second);
       else
         new_cl->AppendSwitch(i->first);
     }
+
+#if defined(OS_WIN)
+    // On Windows 8 we can relaunch in metro or desktop mode.
+    if (g_mode_switch)
+      upgrade_util::RelaunchChromeWithModeSwitch(*new_cl.get());
+    else
+      upgrade_util::RelaunchChromeBrowser(*new_cl.get());
+#else 
     upgrade_util::RelaunchChromeBrowser(*new_cl.get());
+#endif  // defined(OS_WIN)
+
 #else
     NOTIMPLEMENTED();
 #endif  // !defined(OS_CHROMEOS)
   }
 
   if (shutdown_type_ > NOT_VALID && shutdown_num_processes_ > 0) {
     // Measure total shutdown time as late in the process as possible
     // and then write it to a file to be read at startup.
     // We can't use prefs since all services are shutdown at this point.
     TimeDelta shutdown_delta = Time::Now() - *shutdown_started_;
@@ skipping 83 matching lines @@
 
 bool ShuttingDownWithoutClosingBrowsers() {
   return g_shutting_down_without_closing_browsers;
 }
 
 void SetShuttingDownWithoutClosingBrowsers(bool without_close) {
   g_shutting_down_without_closing_browsers = without_close;
 }
 
 }  // namespace browser_shutdown