summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_service.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 19:25:38 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 19:25:38 +0000
commit1de6f2bf3cf4324737eeb5d4d67f3c76bfa1a60a (patch)
treec5b017af643fa263fc6b97148a78139dee27d0b7 /chrome/browser/plugin_service.h
parentd3ff52b38ae7096cf95b9cce4308f4081a38a662 (diff)
downloadchromium_src-1de6f2bf3cf4324737eeb5d4d67f3c76bfa1a60a.zip
chromium_src-1de6f2bf3cf4324737eeb5d4d67f3c76bfa1a60a.tar.gz
chromium_src-1de6f2bf3cf4324737eeb5d4d67f3c76bfa1a60a.tar.bz2
Ensure we don't load plugins on the IO thread
BUG=17938 TEST=added asserts which crash if plugins loaded on IO thread, current UI tests exercise them Review URL: http://codereview.chromium.org/164305 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service.h')
-rw-r--r--chrome/browser/plugin_service.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h
index 8bcbf7c..c8be00d 100644
--- a/chrome/browser/plugin_service.h
+++ b/chrome/browser/plugin_service.h
@@ -45,7 +45,11 @@ class PluginService
// Returns the PluginService singleton.
static PluginService* GetInstance();
- // Gets the list of available plugins.
+ // Returns true iff the plugin list has been loaded.
+ bool PluginsLoaded();
+
+ // Loads the plugin list. Must be called on the file thread only since it may
+ // have to crawl the disk.
void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins);
// Load all the plugins that should be loaded for the lifetime of the browser