diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
| commit | b6badfa6a538f889025db775662fe61fcb45dc37 (patch) | |
| tree | d12fb54a46443e18a9fa9a671392966ba6751202 /chrome/common/default_plugin.cc | |
| parent | e0e75f67163f77051d8f62d5275dbf40627d5398 (diff) | |
| download | chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.zip chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.gz chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.bz2 | |
Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69766, which was itself a failed
revert of r69755.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5996003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/default_plugin.cc')
| -rw-r--r-- | chrome/common/default_plugin.cc | 9 |
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 |