Third part of porting Chrome Ash to Windows 7

chrome/browser/browser_process_platform_part_aurawin.cc

 // Copyright (c) 2013 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_process_platform_part_aurawin.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/process/kill.h"
@@ skipping 23 matching lines @@
 
 void BrowserProcessPlatformPart::OnMetroViewerProcessTerminated() {
   metro_viewer_process_host_.reset(NULL);
 }
 
 void BrowserProcessPlatformPart::PlatformSpecificCommandLineProcessing(
     const CommandLine& command_line) {
   // Check for Windows 8 specific commandlines requesting that this process
   // either connect to an existing viewer or launch a new viewer and
   // synchronously wait for it to connect.
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
-    bool launch = command_line.HasSwitch(switches::kViewerLaunchViaAppId);
-    bool connect = (launch ||
-                    (command_line.HasSwitch(switches::kViewerConnect) &&
-                     !metro_viewer_process_host_.get()));
-    if (connect) {
-      // Create a host to connect to the Metro viewer process over IPC.
-      metro_viewer_process_host_.reset(new ChromeMetroViewerProcessHost());
-      if (launch) {
-        CHECK(metro_viewer_process_host_->LaunchViewerAndWaitForConnection(
-            command_line.GetSwitchValueNative(
-                switches::kViewerLaunchViaAppId)));
-      }
-    }
+  bool launch = command_line.HasSwitch(switches::kViewerLaunchViaAppId);
+  bool connect = (launch ||
+                  (command_line.HasSwitch(switches::kViewerConnect) &&
+                    !metro_viewer_process_host_.get()));
+  if (!connect)
+    return;
+  // Create a host to connect to the Metro viewer process over IPC.
+  metro_viewer_process_host_.reset(new ChromeMetroViewerProcessHost());
+  if (launch) {
+    CHECK(metro_viewer_process_host_->LaunchViewerAndWaitForConnection(

[sky, 2014/04/14 13:55:17]

We're not going to use the metro viewer code for this, are we?

[cpu_(ooo_6.6-7.5), 2014/04/14 20:02:06]

The current plan includes the viewer process in metro_driver.dll. Just like in
win8.

We could use a different thread on the browser but I felt that it could beget
the issues we had with the previous code in which activation & focus bugs are
masked because of the differences on message pumping.

I am going to be OOO for a few days and this CL has been abandoned and ananta is
going to continue it on a different CL.

+        command_line.GetSwitchValueNative(
+            switches::kViewerLaunchViaAppId)));
   }
 }
 
 void BrowserProcessPlatformPart::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
 
   DCHECK(type == chrome::NOTIFICATION_APP_TERMINATING);
   PrefService* pref_service = g_browser_process->local_state();
   bool is_relaunch = pref_service->GetBoolean(prefs::kWasRestarted);
   if (is_relaunch) {
     upgrade_util::RelaunchMode mode =
         upgrade_util::RelaunchModeStringToEnum(
             pref_service->GetString(prefs::kRelaunchMode));
     if (metro_viewer_process_host_.get()) {
       if (mode == upgrade_util::RELAUNCH_MODE_DESKTOP) {
         // Metro -> Desktop
         chrome::ActivateDesktopHelper(chrome::ASH_TERMINATE);
       } else {
         // Metro -> Metro
         aura::HandleMetroExit();
       }
     }
   }
 }