Block NPAPI plug-ins in Metro mode instead of not loading them at all.

chrome/browser/plugins/plugin_observer.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_observer.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_infobar_delegates.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 183 matching lines @@
 #if defined(ENABLE_PLUGIN_INSTALLATION)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_FindMissingPlugin,
                         OnFindMissingPlugin)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RemovePluginPlaceholderHost,
                         OnRemovePluginPlaceholderHost)
 #endif
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_OpenAboutPlugins,
                         OnOpenAboutPlugins)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CouldNotLoadPlugin,
                         OnCouldNotLoadPlugin)
+#if defined(OS_WIN)
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RestartInDesktopMode,
+                        OnRestartInDesktopMode)
+#endif
 
     IPC_MESSAGE_UNHANDLED(return false)
   IPC_END_MESSAGE_MAP()
 
   return true;
 }
 
 void PluginObserver::OnBlockedUnauthorizedPlugin(
     const string16& name,
     const std::string& identifier) {
@@ skipping 52 matching lines @@
   plugin_placeholders_[placeholder_id] =
       new PluginPlaceholderHost(this, placeholder_id,
                                 plugin_metadata->name(),
                                 installer);
   base::Closure callback =  base::Bind(&PluginObserver::InstallMissingPlugin,
                                        weak_ptr_factory_.GetWeakPtr(),
                                        installer,
                                        base::Passed(plugin_metadata->Clone()));
   InfoBarTabHelper* infobar_helper =
       InfoBarTabHelper::FromWebContents(web_contents());
-  InfoBarDelegate* delegate;
-#if !defined(OS_WIN)
-  delegate = PluginInstallerInfoBarDelegate::Create(
+  InfoBarDelegate* delegate = PluginInstallerInfoBarDelegate::Create(
       infobar_helper, installer,
       plugin_metadata.Pass(),
       callback);
-#else
-  delegate = base::win::IsMetroProcess() ?
-      PluginMetroModeInfoBarDelegate::Create(
-          infobar_helper, plugin_metadata->name()) :
-      PluginInstallerInfoBarDelegate::Create(
-          infobar_helper, installer,
-          plugin_metadata.Pass(),
-          callback);
-#endif
   infobar_helper->AddInfoBar(delegate);
 }
 
 void PluginObserver::InstallMissingPlugin(
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata) {
   if (plugin_metadata->url_for_display()) {
     installer->OpenDownloadURL(plugin_metadata->plugin_url(), web_contents());
   } else {
     TabModalConfirmDialog::Create(
@@ skipping 31 matching lines @@
       InfoBarTabHelper::FromWebContents(web_contents());
   infobar_helper->AddInfoBar(new SimpleAlertInfoBarDelegate(
       infobar_helper,
       &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           IDR_INFOBAR_PLUGIN_CRASHED),
       l10n_util::GetStringFUTF16(IDS_PLUGIN_INITIALIZATION_ERROR_PROMPT,
                                  plugin_name),
       true  /* auto_expire */));
 }
 
+#if defined(OS_WIN)
+void PluginObserver::OnRestartInDesktopMode() {
+  DCHECK(base::win::IsMetroProcess());
+  browser::AttemptRestartWithModeSwitch();
+}
+#endif