Chromium Code Reviews| Index: chrome/browser/plugin_data_remover.cc |
| diff --git a/chrome/browser/plugin_data_remover.cc b/chrome/browser/plugin_data_remover.cc |
| index 4e6ac7f3c71bf5ca4a9ba8d6be6bad0c2e75bd59..8d46b3d4aa8a9e352593106c84de3f9ebefb6622 100644 |
| --- a/chrome/browser/plugin_data_remover.cc |
| +++ b/chrome/browser/plugin_data_remover.cc |
| @@ -4,11 +4,13 @@ |
| #include "chrome/browser/plugin_data_remover.h" |
| +#include "base/command_line.h" |
| #include "base/message_loop_proxy.h" |
| #include "base/metrics/histogram.h" |
| #include "base/version.h" |
| #include "chrome/browser/browser_thread.h" |
| #include "chrome/browser/plugin_service.h" |
| +#include "chrome/common/chrome_switches.h" |
| #include "chrome/common/plugin_messages.h" |
| #include "webkit/plugins/npapi/plugin_group.h" |
| #include "webkit/plugins/npapi/plugin_list.h" |
| @@ -156,8 +158,13 @@ bool PluginDataRemover::IsSupported() { |
| } |
| scoped_ptr<Version> version( |
| webkit::npapi::PluginGroup::CreateVersionFromString(plugin.version)); |
| + std::string min_version_string = |
| + CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
| + switches::kMinClearSiteDataFlashVersion); |
| + if (min_version_string.empty()) |
| + min_version_string = kMinFlashVersion; |
| scoped_ptr<Version> min_version( |
| - Version::GetVersionFromString(kMinFlashVersion)); |
| + Version::GetVersionFromString(min_version_string)); |
|
jochen (gone - plz use gerrit)
2011/01/14 13:55:28
btw, what happens if the version string is unparsa
|
| return plugin.enabled && |
| version.get() && |
| min_version->CompareTo(*version) == -1; |