summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_service.h
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 20:56:18 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 20:56:18 +0000
commitba0ad5cfc951e80eea8b6a8c3ac2ddd02762b8df (patch)
tree6999d1fae5a73937e489c0819a528eb538a8558d /chrome/browser/plugin_service.h
parentd750e4d1052bd33755326f122bb2ab73df9e0079 (diff)
downloadchromium_src-ba0ad5cfc951e80eea8b6a8c3ac2ddd02762b8df.zip
chromium_src-ba0ad5cfc951e80eea8b6a8c3ac2ddd02762b8df.tar.gz
chromium_src-ba0ad5cfc951e80eea8b6a8c3ac2ddd02762b8df.tar.bz2
Revert 23064 - 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 TBR=jam@chromium.org Review URL: http://codereview.chromium.org/165321 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service.h')
-rw-r--r--chrome/browser/plugin_service.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h
index c8be00d..8bcbf7c 100644
--- a/chrome/browser/plugin_service.h
+++ b/chrome/browser/plugin_service.h
@@ -45,11 +45,7 @@ class PluginService
// Returns the PluginService singleton.
static PluginService* GetInstance();
- // 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.
+ // Gets the list of available plugins.
void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins);
// Load all the plugins that should be loaded for the lifetime of the browser