diff options
| -rw-r--r-- | chrome/browser/plugins/plugin_prefs.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/plugins/plugin_prefs.h | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/plugins/plugin_prefs.cc b/chrome/browser/plugins/plugin_prefs.cc index 53ccefd..33f218b 100644 --- a/chrome/browser/plugins/plugin_prefs.cc +++ b/chrome/browser/plugins/plugin_prefs.cc @@ -66,13 +66,6 @@ void PluginPrefs::PluginState::Set(const base::FilePath& plugin, bool enabled) { state_[ConvertMapKey(plugin)] = enabled; } -void PluginPrefs::PluginState::SetIgnorePseudoKey(const base::FilePath& plugin, - bool enabled) { - base::FilePath key = ConvertMapKey(plugin); - if (key == plugin) - state_[key] = enabled; -} - base::FilePath PluginPrefs::PluginState::ConvertMapKey( const base::FilePath& plugin) const { // Keep the state of component-updated and bundled Pepper Flash in sync. @@ -470,7 +463,7 @@ void PluginPrefs::SetPrefs(PrefService* prefs) { pepper_flash_node = plugin; } - plugin_state_.SetIgnorePseudoKey(plugin_path, enabled); + plugin_state_.Set(plugin_path, enabled); } else if (!enabled && plugin->GetString("name", &group_name)) { // Don't disable this group if it's for the pdf or nacl plugins and // we just forced it on. diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index 4b2e18b..4aca8f7 100644 --- a/chrome/browser/plugins/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -99,9 +99,6 @@ class PluginPrefs : public RefcountedProfileKeyedService { // |*enabled| won't be touched. bool Get(const base::FilePath& plugin, bool* enabled) const; void Set(const base::FilePath& plugin, bool enabled); - // It is similar to Set(), except that it does nothing if |plugin| needs to - // be converted to a different key. - void SetIgnorePseudoKey(const base::FilePath& plugin, bool enabled); private: base::FilePath ConvertMapKey(const base::FilePath& plugin) const; |