summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/npapi/plugin_list.h
diff options
context:
space:
mode:
authormarshall@chromium.org <marshall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 16:03:41 +0000
committermarshall@chromium.org <marshall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 16:03:41 +0000
commit8ca37f412b605824cdb6917b1f5bdc17e6319d1f (patch)
tree5027b2bbee61a24385c5e0e17ac66ab78eba4e64 /webkit/plugins/npapi/plugin_list.h
parent8b777678e32dcf2e1921a63f97c85b3a40c8b481 (diff)
downloadchromium_src-8ca37f412b605824cdb6917b1f5bdc17e6319d1f.zip
chromium_src-8ca37f412b605824cdb6917b1f5bdc17e6319d1f.tar.gz
chromium_src-8ca37f412b605824cdb6917b1f5bdc17e6319d1f.tar.bz2
Support the specification of complete plugin information including multiple mime types and file extensions for internal plugins that have been compiled into the binary. This is needed for the Chromium Embedded Framework (CEF) which supports the registration of complex internal plugins.
Review URL: http://codereview.chromium.org/8386002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/npapi/plugin_list.h')
-rw-r--r--webkit/plugins/npapi/plugin_list.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h
index 1669251..847af14 100644
--- a/webkit/plugins/npapi/plugin_list.h
+++ b/webkit/plugins/npapi/plugin_list.h
@@ -85,16 +85,13 @@ class PluginList {
// be loaded using PluginList::LoadPlugin().
void RegisterInternalPlugin(const webkit::WebPluginInfo& info);
- // This second version is for "plugins" that have been compiled
- // directly into the binary -- callers must provide the metadata and
- // the entry points.
- // TODO(evan): we use file names here, but they're not really files, they're
- // actually a string that uniquely identifies the plugin.
- void RegisterInternalPlugin(const FilePath& filename,
- const std::string& name,
- const std::string& description,
- const std::string& mime_type,
- const PluginEntryPoints& entry_points);
+ // This second version is for "plugins" that have been compiled directly into
+ // the binary -- callers must provide the plugin information and the entry
+ // points. If |add_at_beginning| is true the plugin will be added earlier in
+ // the list so that it can override the MIME types of older registrations.
+ void RegisterInternalPlugin(const webkit::WebPluginInfo& info,
+ const PluginEntryPoints& entry_points,
+ bool add_at_beginning);
// Removes a specified internal plugin from the list. The search will match
// on the path from the version info previously registered.