| Index: content/renderer/pepper/ppapi_interface_factory.h
|
| ===================================================================
|
| --- content/renderer/pepper/ppapi_interface_factory.h (revision 213482)
|
| +++ content/renderer/pepper/ppapi_interface_factory.h (working copy)
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_INTERFACE_FACTORY_H_
|
| -#define WEBKIT_PLUGINS_PPAPI_PLUGIN_INTERFACE_FACTORY_H_
|
| +#ifndef CONTENT_RENDERER_PEPPER_PLUGIN_INTERFACE_FACTORY_H_
|
| +#define CONTENT_RENDERER_PEPPER_PLUGIN_INTERFACE_FACTORY_H_
|
|
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/lazy_instance.h"
|
| -#include "webkit/plugins/webkit_plugins_export.h"
|
| +#include "content/common/content_export.h"
|
|
|
| namespace webkit {
|
| namespace ppapi {
|
| @@ -22,10 +22,10 @@
|
| typedef const void* (InterfaceFactory)(const std::string& interface_name);
|
|
|
| // Registers a custom PPAPI interface factory.
|
| - WEBKIT_PLUGINS_EXPORT void RegisterFactory(InterfaceFactory* factory);
|
| + CONTENT_EXPORT void RegisterFactory(InterfaceFactory* factory);
|
|
|
| // Unregisters the custom PPAPI interface factory passed in.
|
| - WEBKIT_PLUGINS_EXPORT void UnregisterFactory(InterfaceFactory* factory);
|
| + CONTENT_EXPORT void UnregisterFactory(InterfaceFactory* factory);
|
|
|
| // Returns a pointer to the interface identified by the name passed in.
|
| // Returns NULL if no factory handles this interface.
|
| @@ -33,7 +33,7 @@
|
|
|
| // Returns a pointer to the global instance of the
|
| // PpapiInterfaceFactoryManager class.
|
| - WEBKIT_PLUGINS_EXPORT static PpapiInterfaceFactoryManager* GetInstance();
|
| + CONTENT_EXPORT static PpapiInterfaceFactoryManager* GetInstance();
|
|
|
| private:
|
| friend struct base::DefaultLazyInstanceTraits<PpapiInterfaceFactoryManager>;
|
| @@ -52,5 +52,5 @@
|
| } // namespace ppapi
|
| } // namespace webkit
|
|
|
| -#endif // WEBKIT_PLUGINS_PPAPI_PLUGIN_INTERFACE_FACTORY_H_
|
| +#endif // CONTENT_RENDERER_PEPPER_PLUGIN_INTERFACE_FACTORY_H_
|
|
|
|
|