OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/plugin_data_remover.h" | 5 #include "chrome/browser/plugin_data_remover.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/message_loop_proxy.h" | 8 #include "base/message_loop_proxy.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/version.h" | 10 #include "base/version.h" |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 GURL(), kFlashMimeType, allow_wildcard, &plugin, &mime_type)) { | 169 GURL(), kFlashMimeType, allow_wildcard, &plugin, &mime_type)) { |
170 return false; | 170 return false; |
171 } | 171 } |
172 scoped_ptr<Version> version( | 172 scoped_ptr<Version> version( |
173 webkit::npapi::PluginGroup::CreateVersionFromString(plugin.version)); | 173 webkit::npapi::PluginGroup::CreateVersionFromString(plugin.version)); |
174 scoped_ptr<Version> min_version(Version::GetVersionFromString( | 174 scoped_ptr<Version> min_version(Version::GetVersionFromString( |
175 CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 175 CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
176 switches::kMinClearSiteDataFlashVersion))); | 176 switches::kMinClearSiteDataFlashVersion))); |
177 if (!min_version.get()) | 177 if (!min_version.get()) |
178 min_version.reset(Version::GetVersionFromString(kMinFlashVersion)); | 178 min_version.reset(Version::GetVersionFromString(kMinFlashVersion)); |
179 return plugin.enabled && | 179 return webkit::npapi::IsPluginEnabled(plugin) && |
180 version.get() && | 180 version.get() && |
181 min_version->CompareTo(*version) == -1; | 181 min_version->CompareTo(*version) == -1; |
182 } | 182 } |
OLD | NEW |