Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6727)

Unified Diff: chrome/renderer/plugins/plugin_placeholder.cc

Issue 11066043: Block NPAPI plug-ins in Metro mode instead of not loading them at all. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/plugins/plugin_placeholder.cc
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc
index e46e9e463dd5bcf84ae69a8bd472d5952af924ee..d407904f43a90b32d06f67001053bd7599a567c6 100644
--- a/chrome/renderer/plugins/plugin_placeholder.cc
+++ b/chrome/renderer/plugins/plugin_placeholder.cc
@@ -557,6 +557,18 @@ void PluginPlaceholder::LoadPlugin() {
return;
}
+ if (status_->value ==
+ ChromeViewHostMsg_GetPluginInfo_Status::kNpapiNotSupported) {
+#if defined(OS_WIN)
+ RenderThread::Get()->RecordUserMetrics("Metro_RestartOnDesktop_Plugin");
+ RenderThread::Get()->Send(
cpu_(ooo_6.6-7.5) 2012/10/18 00:42:59 we need a person from sec-team to approve this.
Bernhard Bauer 2012/10/18 09:13:57 Chris, what's your opinion?
+ new ChromeViewHostMsg_RestartInDesktopMode(routing_id()));
+ return;
+#else
+ NOTREACHED();
+#endif
+ }
+
// TODO(mmenke): In the case of prerendering, feed into
// ChromeContentRendererClient::CreatePlugin instead, to
// reduce the chance of future regressions.

Powered by Google App Engine
This is Rietveld 408576698