| Index: content/test/cpp_binding_example.h
|
| diff --git a/content/test/cpp_binding_example.h b/content/test/cpp_binding_example.h
|
| index f594ae7fdca93cd5b79b44fa9018e29f5b93d5bc..d764467e8203b12e0a5deefc42bfdc7fc9dcebd6 100644
|
| --- a/content/test/cpp_binding_example.h
|
| +++ b/content/test/cpp_binding_example.h
|
| @@ -33,11 +33,11 @@
|
| </script>
|
| */
|
|
|
| -#include "webkit/renderer/cpp_bound_class.h"
|
| +#include "content/renderer/cpp_bound_class.h"
|
|
|
| namespace content {
|
|
|
| -class CppBindingExample : public webkit_glue::CppBoundClass {
|
| +class CppBindingExample : public CppBoundClass {
|
| public:
|
| // The default constructor initializes the property and method lists needed
|
| // to bind this class to a JS object.
|
| @@ -55,30 +55,26 @@ class CppBindingExample : public webkit_glue::CppBoundClass {
|
| //
|
|
|
| // Returns the value that was passed in as its first (only) argument.
|
| - void echoValue(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void echoValue(const CppArgumentList& args, CppVariant* result);
|
|
|
| // Returns a hard-coded value of the same type (bool, number (double),
|
| // string, or null) that was passed in as an argument.
|
| - void echoType(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void echoType(const CppArgumentList& args, CppVariant* result);
|
|
|
| // Returns the sum of the (first) two arguments as a double, if they are both
|
| // numbers (integers or doubles). Otherwise returns null.
|
| - void plus(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void plus(const CppArgumentList& args, CppVariant* result);
|
|
|
| // Always returns the same value -- an example of a read-only property.
|
| - void same(webkit_glue::CppVariant* result);
|
| + void same(CppVariant* result);
|
|
|
| // Invoked when a nonexistent method is called on this example object, this
|
| // prints an error message.
|
| - void fallbackMethod(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + void fallbackMethod(const CppArgumentList& args, CppVariant* result);
|
|
|
| // These properties will also be exposed to JavaScript.
|
| - webkit_glue::CppVariant my_value;
|
| - webkit_glue::CppVariant my_other_value;
|
| + CppVariant my_value;
|
| + CppVariant my_other_value;
|
| };
|
|
|
| } // namespace content
|
|
|