| Index: content/renderer/cpp_bound_class.h
|
| diff --git a/webkit/renderer/cpp_bound_class.h b/content/renderer/cpp_bound_class.h
|
| similarity index 92%
|
| rename from webkit/renderer/cpp_bound_class.h
|
| rename to content/renderer/cpp_bound_class.h
|
| index 7cc6345290d2e80d8fec376edc14ba0b63471156..afe50afb2e43a6c537140c5b7fa305f502fc0a3a 100644
|
| --- a/webkit/renderer/cpp_bound_class.h
|
| +++ b/content/renderer/cpp_bound_class.h
|
| @@ -15,27 +15,27 @@
|
| See cpp_binding_example.{h|cc} for an example.
|
| */
|
|
|
| -#ifndef WEBKIT_RENDERER_CPP_BOUND_CLASS_H_
|
| -#define WEBKIT_RENDERER_CPP_BOUND_CLASS_H_
|
| +#ifndef CONTENT_RENDERER_CPP_BOUND_CLASS_H_
|
| +#define CONTENT_RENDERER_CPP_BOUND_CLASS_H_
|
|
|
| #include <map>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| -#include "webkit/renderer/cpp_variant.h"
|
| -#include "webkit/renderer/webkit_renderer_export.h"
|
| +#include "content/common/content_export.h"
|
| +#include "content/renderer/cpp_variant.h"
|
|
|
| namespace WebKit {
|
| class WebFrame;
|
| }
|
|
|
| -namespace webkit_glue {
|
| +namespace content {
|
|
|
| typedef std::vector<CppVariant> CppArgumentList;
|
|
|
| // CppBoundClass lets you map Javascript method calls and property accesses
|
| // directly to C++ method calls and CppVariant* variable access.
|
| -class WEBKIT_RENDERER_EXPORT CppBoundClass {
|
| +class CONTENT_EXPORT CppBoundClass {
|
| public:
|
| class PropertyCallback {
|
| public:
|
| @@ -123,7 +123,9 @@ class WEBKIT_RENDERER_EXPORT CppBoundClass {
|
| // NPObject callbacks.
|
| friend struct CppNPObject;
|
| bool HasMethod(NPIdentifier ident) const;
|
| - bool Invoke(NPIdentifier ident, const NPVariant* args, size_t arg_count,
|
| + bool Invoke(NPIdentifier ident,
|
| + const NPVariant* args,
|
| + size_t arg_count,
|
| NPVariant* result);
|
| bool HasProperty(NPIdentifier ident) const;
|
| bool GetProperty(NPIdentifier ident, NPVariant* result) const;
|
| @@ -142,6 +144,6 @@ class WEBKIT_RENDERER_EXPORT CppBoundClass {
|
| DISALLOW_COPY_AND_ASSIGN(CppBoundClass);
|
| };
|
|
|
| -} // namespace webkit_glue
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_CPP_BOUND_CLASS_H_
|
| +#endif // CONTENT_RENDERER_CPP_BOUND_CLASS_H_
|
|
|