summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 02:58:07 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 02:58:07 +0000
commit00df60f5f14b66ef94d6da1914cfc5fbdb704151 (patch)
tree30fe5f8e057bcca759c826761051271f383cebb1 /webkit/glue/plugins
parent5ec59f251a83117d1985d772fdae53bcb9d5f722 (diff)
downloadchromium_src-00df60f5f14b66ef94d6da1914cfc5fbdb704151.zip
chromium_src-00df60f5f14b66ef94d6da1914cfc5fbdb704151.tar.gz
chromium_src-00df60f5f14b66ef94d6da1914cfc5fbdb704151.tar.bz2
Clean up PluginDataRemover.
This CL fixes some threading issues in PluginDataRemover. It also adds a static method to find out if removing plugin data is supported by an installed plugin, and a method to set the completion task while it is in the process of removing data. BUG=58235 TEST=none Review URL: http://codereview.chromium.org/5715001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
-rw-r--r--webkit/glue/plugins/plugin_group.cc1
-rw-r--r--webkit/glue/plugins/plugin_group.h6
2 files changed, 5 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_group.cc b/webkit/glue/plugins/plugin_group.cc
index 668621d..548e624 100644
--- a/webkit/glue/plugins/plugin_group.cc
+++ b/webkit/glue/plugins/plugin_group.cc
@@ -199,6 +199,7 @@ bool PluginGroup::Match(const WebPluginInfo& plugin) const {
return false;
}
+/* static */
Version* PluginGroup::CreateVersionFromString(const string16& version_string) {
// Remove spaces and ')' from the version string,
// Replace any instances of 'r', ',' or '(' with a dot.
diff --git a/webkit/glue/plugins/plugin_group.h b/webkit/glue/plugins/plugin_group.h
index a771238..5098787 100644
--- a/webkit/glue/plugins/plugin_group.h
+++ b/webkit/glue/plugins/plugin_group.h
@@ -136,6 +136,10 @@ class PluginGroup {
// minimum version.
void DisableOutdatedPlugins();
+ // Parse a version string as used by a plug-in. This method is more lenient
+ // in accepting weird version strings than Version::GetFromString().
+ static Version* CreateVersionFromString(const string16& version_string);
+
private:
typedef std::map<std::string, PluginGroup*> PluginMap;
@@ -176,8 +180,6 @@ class PluginGroup {
void InitFrom(const PluginGroup& other);
- Version* CreateVersionFromString(const string16& version_string);
-
// Set the description and version for this plugin group from the
// given plug-in.
void UpdateDescriptionAndVersion(const WebPluginInfo& plugin);