summaryrefslogtreecommitdiffstats
path: root/chrome/common/default_plugin.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 21:38:12 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 21:38:12 +0000
commitb692a128b073b297a4ce2aa7c468fdd37823e3a8 (patch)
tree3561224ba86e8eabd75f3e7a2f2343002d9a58ff /chrome/common/default_plugin.cc
parentb07c8d9a926a89d0aa7c0de2e1d2685b728a887e (diff)
downloadchromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.zip
chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.tar.gz
chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.tar.bz2
Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put
them in the webkit::npapi namespace. BUG=none TEST=none Review URL: http://codereview.chromium.org/6012002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/default_plugin.cc')
-rw-r--r--chrome/common/default_plugin.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/common/default_plugin.cc b/chrome/common/default_plugin.cc
index bba738b..3337c7c 100644
--- a/chrome/common/default_plugin.cc
+++ b/chrome/common/default_plugin.cc
@@ -5,13 +5,13 @@
#include "chrome/common/default_plugin.h"
#include "chrome/default_plugin/plugin_main.h"
-#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_list.h"
namespace chrome {
void RegisterInternalDefaultPlugin() {
- const NPAPI::PluginVersionInfo default_plugin = {
- FilePath(kDefaultPluginLibraryName),
+ 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",
@@ -27,7 +27,8 @@ void RegisterInternalDefaultPlugin() {
}
};
- NPAPI::PluginList::Singleton()->RegisterInternalPlugin(default_plugin);
+ webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(
+ default_plugin);
}
} // namespace chrome