diff options
author | wfh <wfh@chromium.org> | 2015-05-29 10:56:27 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-29 17:56:57 +0000 |
commit | cfdd80f3d2a845a2267dd9ffe81011609f74eb0c (patch) | |
tree | 2ff88ec066e34c2c701a59509525402975c058a6 /content/browser/plugin_service_impl.h | |
parent | c1995be807fd95a833d93eef029a8642782b0d6e (diff) | |
download | chromium_src-cfdd80f3d2a845a2267dd9ffe81011609f74eb0c.zip chromium_src-cfdd80f3d2a845a2267dd9ffe81011609f74eb0c.tar.gz chromium_src-cfdd80f3d2a845a2267dd9ffe81011609f74eb0c.tar.bz2 |
Disable NPAPI support by removing the --enable-npapi switch, chrome://flags and enterprise policy override.
--enable-npapi-for-testing will remain temporarily until the rest of the NPAPI code and tests are removed.
This is a selective revert of 0539f2f5214fc17fdd5d1964be0ceedf98fdb9ce and 26d09db19381c2236a2890c045761465c78bc958.
BUG=493212,489066
Review URL: https://codereview.chromium.org/1158423003
Cr-Commit-Position: refs/heads/master@{#332006}
Diffstat (limited to 'content/browser/plugin_service_impl.h')
-rw-r--r-- | content/browser/plugin_service_impl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index 1d419e0..2e107a6 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -106,7 +106,6 @@ class CONTENT_EXPORT PluginServiceImpl void UnregisterInternalPlugin(const base::FilePath& path) override; void GetInternalPlugins(std::vector<WebPluginInfo>* plugins) override; bool NPAPIPluginsSupported() override; - void EnableNpapiPlugins() override; void DisablePluginsDiscoveryForTesting() override; #if defined(OS_MACOSX) void AppActivated() override; |