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

Unified Diff: chrome/browser/plugins/plugin_prefs.cc

Issue 1158423003: Disable NPAPI support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unneeded function declaration Created 5 years, 7 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
« no previous file with comments | « chrome/browser/plugins/plugin_prefs.h ('k') | chrome/browser/plugins/plugin_prefs_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_prefs.cc
diff --git a/chrome/browser/plugins/plugin_prefs.cc b/chrome/browser/plugins/plugin_prefs.cc
index b716a2af76ead5165f0e7ace5d2c08348970b337..15a8b0edcaee40d5a3021c601eeb342e0a1cb5e4 100644
--- a/chrome/browser/plugins/plugin_prefs.cc
+++ b/chrome/browser/plugins/plugin_prefs.cc
@@ -280,11 +280,6 @@ void PluginPrefs::UpdatePatternsAndNotify(std::set<base::string16>* patterns,
NotifyPluginStatusChanged();
}
-void PluginPrefs::EnableNpapi() {
- PluginService::GetInstance()->EnableNpapiPlugins();
- NotifyPluginStatusChanged();
-}
-
/*static*/
bool PluginPrefs::IsStringMatchedInSet(
const base::string16& name,
@@ -491,9 +486,6 @@ void PluginPrefs::SetPrefs(PrefService* prefs) {
ListValueToStringSet(prefs_->GetList(prefs::kPluginsEnabledPlugins),
&policy_enabled_plugin_patterns_);
- if (prefs_->GetBoolean(prefs::kEnableNpapi))
- EnableNpapi();
-
registrar_.Init(prefs_);
// Because pointers to our own members will remain unchanged for the
@@ -512,9 +504,6 @@ void PluginPrefs::SetPrefs(PrefService* prefs) {
base::Bind(&PluginPrefs::UpdatePatternsAndNotify,
base::Unretained(this),
&policy_enabled_plugin_patterns_));
- registrar_.Add(prefs::kEnableNpapi,
- base::Bind(&PluginPrefs::EnableNpapi,
- base::Unretained(this)));
NotifyPluginStatusChanged();
}
« no previous file with comments | « chrome/browser/plugins/plugin_prefs.h ('k') | chrome/browser/plugins/plugin_prefs_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698