summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_updater.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 01:04:44 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 01:04:44 +0000
commitecc166dd8f1bd5bcbf39c868cc4dd7f5ca2de634 (patch)
tree5108fa42f1f0ed12ec81cfdbe5f3c6071cd2eb71 /chrome/browser/plugin_updater.cc
parentccd07800092c2f6337decffb62c9eb30c1d946b2 (diff)
downloadchromium_src-ecc166dd8f1bd5bcbf39c868cc4dd7f5ca2de634.zip
chromium_src-ecc166dd8f1bd5bcbf39c868cc4dd7f5ca2de634.tar.gz
chromium_src-ecc166dd8f1bd5bcbf39c868cc4dd7f5ca2de634.tar.bz2
Fix about:plugins loading the plugin list on the UI thread. This way I can renable the check against loading the plugins on the UI/IO thread.
Review URL: http://codereview.chromium.org/3569008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_updater.cc')
-rw-r--r--chrome/browser/plugin_updater.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/plugin_updater.cc b/chrome/browser/plugin_updater.cc
index 3a96cee..17ec60a 100644
--- a/chrome/browser/plugin_updater.cc
+++ b/chrome/browser/plugin_updater.cc
@@ -26,7 +26,7 @@
PluginUpdater::PluginUpdater() : enable_internal_pdf_(true) {
}
-// Convert to a List of Groups
+// static
void PluginUpdater::GetPluginGroups(PluginMap* plugin_groups) {
DCHECK(plugin_groups);
@@ -73,6 +73,7 @@ DictionaryValue* PluginUpdater::CreatePluginFileSummary(
return data;
}
+// static
ListValue* PluginUpdater::GetPluginGroupsData() {
PluginMap plugin_groups;
GetPluginGroups(&plugin_groups);