Add relaunch into ASH and desktop support for Chrome on Windows 7.

win8/delegate_execute/delegate_execute_operation.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 "win8/delegate_execute/delegate_execute_operation.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
+#include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
 #include "win8/delegate_execute/delegate_execute_util.h"
 
 namespace delegate_execute {
 
 DelegateExecuteOperation::DelegateExecuteOperation()
     : operation_type_(DELEGATE_EXECUTE) {
 }
 
 DelegateExecuteOperation::~DelegateExecuteOperation() {
 }
 
 bool DelegateExecuteOperation::Init(const CommandLine* cmd_line) {
-  base::FilePath shortcut(
-      cmd_line->GetSwitchValuePath(switches::kRelaunchShortcut));
-  if (shortcut.empty()) {
-    operation_type_ = DELEGATE_EXECUTE;
-    return true;
+  if (base::win::GetVersion() >= base::win::VERSION_WIN7) {
+    base::FilePath shortcut(
+        cmd_line->GetSwitchValuePath(switches::kRelaunchShortcut));
+    // On Windows 7 the command line coming in may not have a path to the
+    // shortcut to launch Chrome. We ignore the shortcut and just do a regular
+    // ShellExecute of chrome.exe in this case.
+    if (shortcut.empty() &&
+        base::win::GetVersion() >= base::win::VERSION_WIN8) {
+      operation_type_ = DELEGATE_EXECUTE;
+      return true;
+    }
+    relaunch_shortcut_ = shortcut;
   }
-  relaunch_shortcut_ = shortcut;
   mutex_ = cmd_line->GetSwitchValueNative(switches::kWaitForMutex);
   if (mutex_.empty())
     return false;
   // Add the mode forcing flags, if any.
   const char* the_switch = NULL;
 
   if (cmd_line->HasSwitch(switches::kForceDesktop))
     the_switch = switches::kForceDesktop;
   else if (cmd_line->HasSwitch(switches::kForceImmersive))
     the_switch = switches::kForceImmersive;
 
   relaunch_flags_ = ParametersFromSwitch(the_switch);
 
   operation_type_ = RELAUNCH_CHROME;
   return true;
 }
 
 DWORD DelegateExecuteOperation::GetParentPid() const {
   std::vector<base::string16> parts;
   base::SplitString(mutex_, L'.', &parts);
   if (parts.size() != 3)
     return 0;
   DWORD pid;
   if (!base::StringToUint(parts[2], reinterpret_cast<uint32*>(&pid)))
     return 0;
   return pid;
 }
 
 }  // namespace delegate_execute