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

chrome/browser/plugins/plugin_infobar_delegates.cc

Index: chrome/browser/plugins/plugin_infobar_delegates.cc
diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc
index d9c99be685aa4711edab10f1b6f0c817bba12569..1add8b56e6335ea53262909cad4bfc6f12f54baf 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.cc
+++ b/chrome/browser/plugins/plugin_infobar_delegates.cc
@@ -482,15 +482,9 @@ int PluginMetroModeInfoBarDelegate::GetButtons() const {
 
 base::string16 PluginMetroModeInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {

[cpu_(ooo_6.6-7.5), 2014/08/22 21:47:11]

don't you have to use USE_AURA ? or is this not compiled on mac?

[ananta, 2014/08/22 22:17:53]

This block is under OS_WIN

-#if defined(USE_AURA) && defined(USE_ASH)
-  return l10n_util::GetStringUTF16(IDS_WIN8_DESKTOP_RESTART);
-#else
-  return l10n_util::GetStringUTF16((mode_ == MISSING_PLUGIN) ?
-      IDS_WIN8_DESKTOP_RESTART : IDS_WIN8_DESKTOP_OPEN);
-#endif
+  return l10n_util::GetStringUTF16(IDS_WIN_DESKTOP_RESTART);
 }
 
-#if defined(USE_AURA) && defined(USE_ASH)
 void LaunchDesktopInstanceHelper(const base::string16& url) {
   base::FilePath exe_path;
   if (!PathService::Get(base::FILE_EXE, &exe_path))
@@ -504,7 +498,6 @@ void LaunchDesktopInstanceHelper(const base::string16& url) {
   aura::RemoteWindowTreeHostWin::Instance()->HandleOpenURLOnDesktop(
       shortcut_path, url);
 }
-#endif
 
 bool PluginMetroModeInfoBarDelegate::Accept() {
   chrome::AttemptRestartToDesktopMode();