Revert of Remove remote tree host and some related input and metro_driver code

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 <shlguid.h>
@@ skipping 14 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/win/dpi.h"
 #include "win8/delegate_execute/chrome_util.h"
 #include "win8/delegate_execute/delegate_execute_util.h"
+#include "win8/viewer/metro_viewer_constants.h"
 
 namespace {
 // Helper function to retrieve the url from IShellItem interface passed in.
 // Returns S_OK on success.
 HRESULT GetUrlFromShellItem(IShellItem* shell_item, base::string16* url) {
   DCHECK(shell_item);
   DCHECK(url);
   // First attempt to get the url from the underlying IDataObject if any. This
   // ensures that we get the full url, i.e. including the anchor.
   // If we fail to get the underlying IDataObject we retrieve the url via the
@@ skipping 166 matching lines @@
 STDMETHODIMP CommandExecuteImpl::SetDirectory(LPCWSTR directory) {
   return S_OK;
 }
 
 STDMETHODIMP CommandExecuteImpl::GetValue(enum AHE_TYPE* pahe) {
   if (!GetLaunchScheme(&display_name_, &launch_scheme_)) {
     AtlTrace("Failed to get scheme, E_FAIL\n");
     return E_FAIL;
   }
 
-  // TODO(scottmg): Can all go eventually https://crbug.com/558054.
-  *pahe = AHE_DESKTOP;
+  EC_HOST_UI_MODE mode = GetLaunchMode();
+  *pahe = (mode == ECHUIM_DESKTOP) ? AHE_DESKTOP : AHE_IMMERSIVE;
+
+  // If we're going to return AHE_IMMERSIVE, then both the browser process and
+  // the metro viewer need to launch and connect before the user can start
+  // browsing.  However we must not launch the metro viewer until we get a
+  // call to CommandExecuteImpl::Execute().  If we wait until then to launch
+  // the browser process as well, it will appear laggy while they connect to
+  // each other, so we pre-launch the browser process now.
+  if (*pahe == AHE_IMMERSIVE && verb_ != win8::kMetroViewerConnectVerb) {
+    LaunchChromeBrowserProcess();
+  }
   return S_OK;
 }
 
 STDMETHODIMP CommandExecuteImpl::Execute() {
   AtlTrace("In %hs\n", __FUNCTION__);
 
   if (integrity_level_ == base::HIGH_INTEGRITY)
     return LaunchDesktopChrome();
 
   EC_HOST_UI_MODE mode = GetLaunchMode();
@@ skipping 239 matching lines @@
     AtlTrace("Launch mode forced by cmdline to %s\n", modes[launch_mode]);
     reg_key.WriteValue(chrome::kLaunchModeValue,
                        static_cast<DWORD>(launch_mode));
     return launch_mode;
   }
 
   launch_mode = ECHUIM_DESKTOP;
   launch_mode_determined = true;
   return launch_mode;
 }