diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 15:50:57 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 15:50:57 +0000 |
| commit | 250afb0e2366b9cffd7831f085be4701e81eb636 (patch) | |
| tree | c66897fd54bc3031c05a39f93d5e4d9486ace92d /chrome/browser/plugin_updater.cc | |
| parent | 8b86363bc6c71aed7d10bef1c496b558faac5628 (diff) | |
| download | chromium_src-250afb0e2366b9cffd7831f085be4701e81eb636.zip chromium_src-250afb0e2366b9cffd7831f085be4701e81eb636.tar.gz chromium_src-250afb0e2366b9cffd7831f085be4701e81eb636.tar.bz2 | |
Revert 55227 - Disable outdated non-sandboxed plugins.
BUG=47731
TEST=Run with --disable-outdated-plugins
Review URL: http://codereview.chromium.org/3038051
TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/3083021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_updater.cc')
| -rw-r--r-- | chrome/browser/plugin_updater.cc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/chrome/browser/plugin_updater.cc b/chrome/browser/plugin_updater.cc index 90a8daa..03846aa 100644 --- a/chrome/browser/plugin_updater.cc +++ b/chrome/browser/plugin_updater.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "base/command_line.h" #include "base/path_service.h" #include "base/scoped_ptr.h" #include "base/values.h" @@ -15,7 +14,6 @@ #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/plugin_group.h" #include "chrome/common/pref_names.h" #include "webkit/glue/plugins/plugin_list.h" @@ -209,19 +207,6 @@ void DisablePluginGroupsFromPrefs(Profile* profile) { } } -void DisableOutdatedPluginGroups() { - std::vector<linked_ptr<PluginGroup> > groups; - GetPluginGroups(&groups); - for (std::vector<linked_ptr<PluginGroup> >::iterator it = - groups.begin(); - it != groups.end(); - ++it) { - if ((*it)->IsVulnerable()) { - (*it)->Enable(false); - } - } -} - void UpdatePreferences(Profile* profile) { ListValue* plugins_list = profile->GetPrefs()->GetMutableList( prefs::kPluginsPluginsList); @@ -249,9 +234,7 @@ void UpdatePreferences(Profile* profile) { it != plugin_groups.end(); ++it) { // Don't save preferences for vulnerable pugins. - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableOutdatedPlugins) || - !(*it)->IsVulnerable()) { + if (!(*it)->IsVulnerable()) { plugins_list->Append((*it)->GetSummary()); } } |