Make the metro viewer responsible for relaunching browser in desktop mode.

chrome/browser/plugins/plugin_infobar_delegates.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 "chrome/browser/plugins/plugin_infobar_delegates.h"
 
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
@@ skipping 19 matching lines @@
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #endif
 #include "chrome/browser/plugins/plugin_installer.h"
 #endif
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include "ui/base/win/shell.h"
+
+#if defined(USE_AURA)
+#include "ui/aura/remote_root_window_host_win.h"
+#endif
 #endif
 
 using content::UserMetricsAction;
 
 
 // PluginInfoBarDelegate ------------------------------------------------------
 
 PluginInfoBarDelegate::PluginInfoBarDelegate(InfoBarService* infobar_service,
                                              const std::string& identifier)
     : ConfirmInfoBarDelegate(infobar_service),
@@ skipping 434 matching lines @@
   if (button == BUTTON_CANCEL)
     return l10n_util::GetStringUTF16(IDS_DONT_ASK_AGAIN_INFOBAR_BUTTON_LABEL);
   return l10n_util::GetStringUTF16((mode_ == MISSING_PLUGIN) ?
       IDS_WIN8_DESKTOP_RESTART : IDS_WIN8_RESTART);
 }
 
 void LaunchDesktopInstanceHelper(const string16& url) {
   base::FilePath exe_path;
   if (!PathService::Get(base::FILE_EXE, &exe_path))
     return;
   base::FilePath shortcut_path(

[sky, 2013/08/30 17:06:56]

nit: 4 space indent is correct here (meaning don't change this).

[zturner, 2013/08/30 18:10:05]

Done.

-      ShellIntegration::GetStartMenuShortcut(exe_path));
+    ShellIntegration::GetStartMenuShortcut(exe_path));
 
-  SHELLEXECUTEINFO sei = { sizeof(sei) };
-  sei.fMask = SEE_MASK_FLAG_LOG_USAGE;
-  sei.nShow = SW_SHOWNORMAL;
-  sei.lpFile = shortcut_path.value().c_str();
-  sei.lpDirectory = L"";
-  sei.lpParameters = url.c_str();
-  ShellExecuteEx(&sei);
+  string16 shortcut = shortcut_path.AsUTF16Unsafe();
+
+  // Actually launching the process needs to happen in the metro viewer,
+  // otherwise it won't automatically transition to desktop.  So we have
+  // to send an IPC to the viewer to do the ShellExecute.
+  aura::RemoteRootWindowHostWin::Instance()->HandleOpenURLOnDesktop(

[sky, 2013/08/30 17:06:56]

What about non-aura?

[zturner, 2013/08/30 17:14:44]

This function is only used as a helper function from
PluginMetroModeInfoBarDelegate::Accept() (defined immediately below), which in
turn only calls this function #if defined(USE_AURA).

Based on that, however, I should probably wrap this function in the same set of
pre-processor defines so that it's compiled out in non-aura.

[zturner, 2013/08/30 18:10:06]

Done.

+    shortcut, url);
 }
 
 bool PluginMetroModeInfoBarDelegate::Accept() {
 #if defined(USE_AURA) && defined(USE_ASH)
   // We need to PostTask as there is some IO involved.
   content::BrowserThread::PostTask(
-      content::BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
-      base::Bind(&LaunchDesktopInstanceHelper,
-                 UTF8ToUTF16(web_contents()->GetURL().spec())));
+    content::BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
+    base::Bind(&LaunchDesktopInstanceHelper,
+    UTF8ToUTF16(web_contents()->GetURL().spec())));
 #else
   chrome::AttemptRestartWithModeSwitch();
 #endif
   return true;
 }
 
 bool PluginMetroModeInfoBarDelegate::Cancel() {
   DCHECK_EQ(DESKTOP_MODE_REQUIRED, mode_);
   Profile::FromBrowserContext(web_contents()->GetBrowserContext())->
       GetHostContentSettingsMap()->SetContentSetting(
@@ skipping 16 matching lines @@
           "https://support.google.com/chrome/?p=ib_redirect_to_desktop"),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;
 }
 
 #endif  // defined(OS_WIN)
 
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)