summaryrefslogtreecommitdiffstats
path: root/chrome/common/default_plugin.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 00:43:44 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 00:43:44 +0000
commitf99c73ade9f93c7257e74992f2e540cb8319c1ad (patch)
tree3f5683ab851f1dceaef14a8f17fcdbac162ba84b /chrome/common/default_plugin.cc
parent036d83894fc084e0d05cc98fcf992505800f0c8c (diff)
downloadchromium_src-f99c73ade9f93c7257e74992f2e540cb8319c1ad.zip
chromium_src-f99c73ade9f93c7257e74992f2e540cb8319c1ad.tar.gz
chromium_src-f99c73ade9f93c7257e74992f2e540cb8319c1ad.tar.bz2
glue: deprecate npapi::PluginVersionInfo
Add new entry points to RegisterInternalPlugin that take the appropriate arguments. Currently they just call into the old version of the function. I intend to remove this function completely, but NaCl still depends on the existing API, so this is the first change while I shuffle depedencies around. TEST=compiles Review URL: http://codereview.chromium.org/6161004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/default_plugin.cc')
-rw-r--r--chrome/common/default_plugin.cc23
1 files changed, 9 insertions, 14 deletions
diff --git a/chrome/common/default_plugin.cc b/chrome/common/default_plugin.cc
index 3337c7c..61bbc87 100644
--- a/chrome/common/default_plugin.cc
+++ b/chrome/common/default_plugin.cc
@@ -10,25 +10,20 @@
namespace chrome {
void RegisterInternalDefaultPlugin() {
- const webkit::npapi::PluginVersionInfo default_plugin = {
- FilePath(webkit::npapi::kDefaultPluginLibraryName),
- L"Default Plug-in",
- L"Provides functionality for installing third-party plug-ins",
- L"1",
- L"*",
- L"",
- L"",
- {
+ const webkit::npapi::PluginEntryPoints entry_points = {
#if !defined(OS_POSIX) || defined(OS_MACOSX)
- default_plugin::NP_GetEntryPoints,
+ default_plugin::NP_GetEntryPoints,
#endif
- default_plugin::NP_Initialize,
- default_plugin::NP_Shutdown
- }
+ default_plugin::NP_Initialize,
+ default_plugin::NP_Shutdown
};
webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(
- default_plugin);
+ FilePath(webkit::npapi::kDefaultPluginLibraryName),
+ "Default Plug-in",
+ "Provides functionality for installing third-party plug-ins",
+ "*",
+ entry_points);
}
} // namespace chrome