Manually merging remaining Win8 changes.

win8/delegate_execute/command_execute_impl.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.
 // Implementation of the CommandExecuteImpl class which implements the
 // IExecuteCommand and related interfaces for handling ShellExecute based
 // launches of the Chrome browser.
 
 #include "win8/delegate_execute/command_execute_impl.h"
 
 #include "base/file_util.h"
@@ skipping 202 matching lines @@
     return S_OK;
   }
 
   string16 app_id = delegate_execute::GetAppId(chrome_exe_);
 
   DWORD pid = 0;
   if (launch_scheme_ == INTERNET_SCHEME_FILE) {
     AtlTrace("Activating for file\n");
     hr = activation_manager->ActivateApplication(app_id.c_str(),
                                                  verb_.c_str(),
-                                                 AO_NOERRORUI,
+                                                 AO_NONE,
                                                  &pid);
   } else {
     AtlTrace("Activating for protocol\n");
     hr = activation_manager->ActivateForProtocol(app_id.c_str(),
                                                  item_array_,
                                                  &pid);
   }
   if (hr == E_APPLICATION_NOT_REGISTERED) {
     AtlTrace("Metro chrome is not registered, launching in desktop\n");
     return LaunchDesktopChrome();
@@ skipping 147 matching lines @@
   }
 
   AtlTrace("Formatted command line is %ls\n", command_line.c_str());
 
   PROCESS_INFORMATION proc_info = {0};
   BOOL ret = CreateProcess(NULL, const_cast<LPWSTR>(command_line.c_str()),
                            NULL, NULL, FALSE, 0, NULL, NULL, &start_info_,
                            &proc_info);
   if (ret) {
     AtlTrace("Process id is %d\n", proc_info.dwProcessId);
+    AllowSetForegroundWindow(proc_info.dwProcessId);
     CloseHandle(proc_info.hProcess);
     CloseHandle(proc_info.hThread);
   } else {
     AtlTrace("Process launch failed, error %d\n", ::GetLastError());
   }
 
   return S_OK;
 }
 
 EC_HOST_UI_MODE CommandExecuteImpl::GetLaunchMode() {
   // We are to return chrome's mode if chrome exists else we query our embedder
   // IServiceProvider and learn the mode from them.
   static bool launch_mode_determined = false;
   static EC_HOST_UI_MODE launch_mode = ECHUIM_DESKTOP;
 
   const char* modes[] = { "Desktop", "Inmmersive", "SysLauncher", "??" };
 
   if (launch_mode_determined)
     return launch_mode;
 
   if (chrome_mode_ != ECHUIM_SYSTEM_LAUNCHER) {
     launch_mode = chrome_mode_;
     AtlTrace("Launch mode is that of chrome, %s\n", modes[launch_mode]);
     launch_mode_determined = true;
     return launch_mode;
   }
 
   if (parameters_ == ASCIIToWide(switches::kForceImmersive)) {
     launch_mode = ECHUIM_IMMERSIVE;
+    launch_mode_determined = true;
+  } else if (parameters_ == ASCIIToWide(switches::kForceDesktop)) {
+    launch_mode = ECHUIM_DESKTOP;
+    launch_mode_determined = true;
+  }
+
+  if (launch_mode_determined) {
+    parameters_.clear();
     AtlTrace("Launch mode forced to %s\n", modes[launch_mode]);
-    launch_mode_determined = true;
     return launch_mode;
   }
 
   CComPtr<IExecuteCommandHost> host;
   CComQIPtr<IServiceProvider> service_provider = m_spUnkSite;
   if (service_provider) {
     service_provider->QueryService(IID_IExecuteCommandHost, &host);
     if (host) {
       host->GetUIMode(&launch_mode);
     } else {
       AtlTrace("Failed to get IID_IExecuteCommandHost. Assuming desktop\n");
     }
   } else {
       AtlTrace("Failed to get IServiceProvider. Assuming desktop mode\n");
   }
   AtlTrace("Launch mode is %s\n", modes[launch_mode]);
   launch_mode_determined = true;
   return launch_mode;
 }