chrome/browser/plugin_data_remover.cc - Issue 5699005: Policy: Re-enabled plugin still disabled

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fixed unit tests. 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

« no previous file with comments | « chrome/browser/dom_ui/plugins_ui.cc ('k') | chrome/browser/plugin_exceptions_table_model_unittest.cc » ('j') | webkit/plugins/npapi/plugin_group.h » ('J')

OLD	NEW
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/message_loop_proxy.h"	7 #include "base/message_loop_proxy.h"

8 #include "base/metrics/histogram.h"	8 #include "base/metrics/histogram.h"

9 #include "base/version.h"	9 #include "base/version.h"

10 #include "chrome/browser/browser_thread.h"	10 #include "chrome/browser/browser_thread.h"

(...skipping 140 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
151 webkit::npapi::WebPluginInfo plugin;	151 webkit::npapi::WebPluginInfo plugin;

152 std::string mime_type;	152 std::string mime_type;

153 if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo(	153 if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo(

154 GURL(), kFlashMimeType, allow_wildcard, &plugin, &mime_type)) {	154 GURL(), kFlashMimeType, allow_wildcard, &plugin, &mime_type)) {

155 return false;	155 return false;

156 }	156 }

157 scoped_ptr<Version> version(	157 scoped_ptr<Version> version(

158 webkit::npapi::PluginGroup::CreateVersionFromString(plugin.version));	158 webkit::npapi::PluginGroup::CreateVersionFromString(plugin.version));

159 scoped_ptr<Version> min_version(	159 scoped_ptr<Version> min_version(

160 Version::GetVersionFromString(kMinFlashVersion));	160 Version::GetVersionFromString(kMinFlashVersion));

161 return plugin.enabled &&	161 return webkit::npapi::IsPluginEnabled(plugin) &&

162 version.get() &&	162 version.get() &&

163 min_version->CompareTo(*version) == -1;	163 min_version->CompareTo(*version) == -1;

164 }	164 }

OLD	NEW