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

Side by Side Diff: chrome/browser/plugin_data_remover.cc

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added empty group prunning. Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 GURL(), kFlashMimeType, allow_wildcard, &plugin, &mime_type)) { 156 GURL(), kFlashMimeType, allow_wildcard, &plugin, &mime_type)) {
157 return false; 157 return false;
158 } 158 }
159 scoped_ptr<Version> version( 159 scoped_ptr<Version> version(
160 webkit::npapi::PluginGroup::CreateVersionFromString(plugin.version)); 160 webkit::npapi::PluginGroup::CreateVersionFromString(plugin.version));
161 scoped_ptr<Version> min_version(Version::GetVersionFromString( 161 scoped_ptr<Version> min_version(Version::GetVersionFromString(
162 CommandLine::ForCurrentProcess()->GetSwitchValueASCII( 162 CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
163 switches::kMinClearSiteDataFlashVersion))); 163 switches::kMinClearSiteDataFlashVersion)));
164 if (!min_version.get()) 164 if (!min_version.get())
165 min_version.reset(Version::GetVersionFromString(kMinFlashVersion)); 165 min_version.reset(Version::GetVersionFromString(kMinFlashVersion));
166 return plugin.enabled && 166 return webkit::npapi::IsPluginEnabled(plugin) &&
167 version.get() && 167 version.get() &&
168 min_version->CompareTo(*version) == -1; 168 min_version->CompareTo(*version) == -1;
169 } 169 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698