| Index: content/child/npapi/plugin_lib.h
|
| ===================================================================
|
| --- content/child/npapi/plugin_lib.h (revision 0)
|
| +++ content/child/npapi/plugin_lib.h (working copy)
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_LIB_H_
|
| -#define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIB_H_
|
| +#ifndef CONTENT_CHILD_NPAPI_PLUGIN_LIB_H_
|
| +#define CONTENT_CHILD_NPAPI_PLUGIN_LIB_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -12,17 +12,16 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/native_library.h"
|
| #include "build/build_config.h"
|
| +#include "content/child/npapi/webplugin.h"
|
| +#include "content/common/content_export.h"
|
| #include "third_party/npapi/bindings/nphostapi.h"
|
| -#include "webkit/plugins/npapi/webplugin.h"
|
| -#include "webkit/plugins/webkit_plugins_export.h"
|
| #include "webkit/plugins/webplugininfo.h"
|
|
|
| namespace base {
|
| class FilePath;
|
| }
|
|
|
| -namespace webkit {
|
| -namespace npapi {
|
| +namespace content {
|
|
|
| class PluginInstance;
|
|
|
| @@ -40,7 +39,7 @@
|
|
|
| // A PluginLib is a single NPAPI Plugin Library, and is the lifecycle
|
| // manager for new PluginInstances.
|
| -class WEBKIT_PLUGINS_EXPORT PluginLib : public base::RefCounted<PluginLib> {
|
| +class CONTENT_EXPORT PluginLib : public base::RefCounted<PluginLib> {
|
| public:
|
| static PluginLib* CreatePluginLib(const base::FilePath& filename);
|
|
|
| @@ -129,7 +128,6 @@
|
| DISALLOW_COPY_AND_ASSIGN(PluginLib);
|
| };
|
|
|
| -} // namespace npapi
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIB_H_
|
| +#endif // CONTENT_CHILD_NPAPI_PLUGIN_LIB_H_
|
|
|