Chrome if launched from Desktop shouldn't try to launch Metro mode Chrome.

ShouldLaunchInWindows8ImmersiveMode function is used inside Chrome to
decide if Chrome launched from desktop should be switched to Metro mode
or not. This flow is specific to non Aura. In case of Aura any relaunch
should go through delegate_execute.

BUG=246429
R=sky,ananta
TEST=see steps in bug description.

Review URL: https://chromiumcodereview.appspot.com/15704003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204166 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
index 9b1dc61..5bc91ec 100644
--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
@@ -183,6 +183,14 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
 // Move this function to a common place as the Windows 8 delegate_execute
 // handler can possibly use this.
 bool ShouldLaunchInWindows8ImmersiveMode(const base::FilePath& user_data_dir) {
+#if defined(USE_AURA)
+  // Returning false from this function doesn't mean we don't launch immersive
+  // mode in Aura. This function is specifically called in case when we need
+  // to relaunch desktop launched chrome into immersive mode through 'relaunch'
+  // menu. In case of Aura, we will use delegate_execute to do the relaunch.
+  return false;
+#endif
+
   if (base::win::GetVersion() < base::win::VERSION_WIN8)
     return false;
 
@@ -192,14 +200,6 @@ bool ShouldLaunchInWindows8ImmersiveMode(const base::FilePath& user_data_dir) {
   if (ShellIntegration::GetDefaultBrowser() != ShellIntegration::IS_DEFAULT)
     return false;
 
-#if defined(USE_AURA)
-  // If we have viewer connection command line then we need to avoid
-  // launching in metro mode as it may create loop.
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kViewerConnection))
-    return false;
-#endif
-
   base::IntegrityLevel integrity_level = base::INTEGRITY_UNKNOWN;
   base::GetProcessIntegrityLevel(base::GetCurrentProcessHandle(),
                                  &integrity_level);