summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/npapi
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 01:43:56 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 01:43:56 +0000
commitd33e7cc3d6195681decd0787db8131eb614e7594 (patch)
tree4e3fecbc3246bc583f98856e1150ff4a6f3d84de /webkit/plugins/npapi
parent6c16a36fff1052efef25d0045f0c6222b027a0eb (diff)
downloadchromium_src-d33e7cc3d6195681decd0787db8131eb614e7594.zip
chromium_src-d33e7cc3d6195681decd0787db8131eb614e7594.tar.gz
chromium_src-d33e7cc3d6195681decd0787db8131eb614e7594.tar.bz2
Convert the PluginService interface to be an async wrapper around PluginList.
This adds additional methods to PluginService so that most callers can be moved off PluginList and use the new asynchronous interface. This is in preparation for moving plugin probing out-of-process on Mac and Linux. BUG=17863,95114 TEST=none Review URL: http://codereview.chromium.org/7980011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/npapi')
-rw-r--r--webkit/plugins/npapi/plugin_list.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h
index 640ccbd..9d4214a 100644
--- a/webkit/plugins/npapi/plugin_list.h
+++ b/webkit/plugins/npapi/plugin_list.h
@@ -36,7 +36,9 @@ extern FilePath::CharType kDefaultPluginLibraryName[];
class PluginInstance;
// This struct holds entry points into a plugin. The entry points are
-// slightly different between Win/Mac and Unixes.
+// slightly different between Win/Mac and Unixes. Note that the interface for
+// querying plugins is synchronous and it is preferable to use a higher-level
+// asynchronous information to query information.
struct PluginEntryPoints {
#if !defined(OS_POSIX) || defined(OS_MACOSX)
NP_GetEntryPointsFunc np_getentrypoints;
@@ -118,7 +120,7 @@ class PluginList {
const string16& mime_type_descriptions,
std::vector<webkit::WebPluginMimeType>* parsed_mime_types);
- // Get all the plugins.
+ // Get all the plugins synchronously.
void GetPlugins(std::vector<webkit::WebPluginInfo>* plugins);
// Returns a list in |info| containing plugins that are found for
@@ -146,7 +148,9 @@ class PluginList {
bool GetPluginInfoByPath(const FilePath& plugin_path,
webkit::WebPluginInfo* info);
- // Populates the given vector with all available plugin groups.
+ // Populates the given vector with all available plugin groups. If
+ // |load_if_necessary| is true, this will potentially load the plugin list
+ // synchronously.
void GetPluginGroups(bool load_if_necessary,
std::vector<PluginGroup>* plugin_groups);