| Index: webkit/plugins/npapi/plugin_lib_posix.cc
|
| ===================================================================
|
| --- webkit/plugins/npapi/plugin_lib_posix.cc (revision 0)
|
| +++ webkit/plugins/npapi/plugin_lib_posix.cc (working copy)
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/glue/plugins/plugin_lib.h"
|
| +#include "webkit/plugins/npapi/plugin_lib.h"
|
|
|
| #include <dlfcn.h>
|
| #if defined(OS_OPENBSD)
|
| @@ -21,16 +21,17 @@
|
| #include "base/string_util.h"
|
| #include "base/sys_string_conversions.h"
|
| #include "base/utf_string_conversions.h"
|
| -#include "webkit/glue/plugins/plugin_list.h"
|
| +#include "webkit/plugins/npapi/plugin_list.h"
|
|
|
| // These headers must be included in this order to make the declaration gods
|
| // happy.
|
| #include "base/third_party/nspr/prcpucfg_linux.h"
|
|
|
| +namespace webkit {
|
| +namespace npapi {
|
| +
|
| namespace {
|
|
|
| -using NPAPI::PluginList;
|
| -
|
| // Copied from nsplugindefs.h instead of including the file since it has a bunch
|
| // of dependencies.
|
| enum nsPluginVariable {
|
| @@ -134,10 +135,8 @@
|
| *unwrapped_path = path;
|
| }
|
|
|
| -} // anonymous namespace
|
| +} // namespace
|
|
|
| -namespace NPAPI {
|
| -
|
| bool PluginLib::ReadWebPluginInfo(const FilePath& filename,
|
| WebPluginInfo* info) {
|
| // The file to reference is:
|
| @@ -253,4 +252,6 @@
|
| }
|
| }
|
|
|
| -} // namespace NPAPI
|
| +
|
| +} // namespace npapi
|
| +} // namespace webkit
|
|
|