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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/plugin_service_impl.h

Issue 645203002: Block NPAPI plugins by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missing test file Created 6 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
« chrome/test/data/load_npapi_plugin.html ('K') | « content/browser/plugin_browsertest.cc ('k') | content/browser/plugin_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/plugin_service_impl.h
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
index a0353e5a51d50fed4a3fcc83977070e8f9470131..a87e7df21eeeb68a783cf4aff723893f029b9c1e 100644
--- a/content/browser/plugin_service_impl.h
+++ b/content/browser/plugin_service_impl.h
@@ -108,6 +108,9 @@ class CONTENT_EXPORT PluginServiceImpl
virtual void GetInternalPlugins(
std::vector<WebPluginInfo>* plugins) override;
virtual bool NPAPIPluginsSupported() override;
+#if defined(OS_WIN) || defined(OS_MACOSX)
jam 2014/10/16 22:10:57 do we really need these ifdefs everywhere? why not
Will Harris 2014/10/17 18:57:08 Done.
+ virtual void EnableNpapiPluginsForTesting() override;
+#endif
virtual void DisablePluginsDiscoveryForTesting() override;
#if defined(OS_MACOSX)
virtual void AppActivated() override;
@@ -230,6 +233,10 @@ class CONTENT_EXPORT PluginServiceImpl
base::WaitableEventWatcher hklm_watcher_;
#endif
+#if defined(OS_WIN) || defined(OS_MACOSX)
+ bool npapi_plugins_enabled_;
+#endif
+
#if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)
ScopedVector<base::FilePathWatcher> file_watchers_;
#endif
« chrome/test/data/load_npapi_plugin.html ('K') | « content/browser/plugin_browsertest.cc ('k') | content/browser/plugin_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698