Index: content/renderer/cpp_variant.h |
diff --git a/webkit/renderer/cpp_variant.h b/content/renderer/cpp_variant.h |
similarity index 92% |
rename from webkit/renderer/cpp_variant.h |
rename to content/renderer/cpp_variant.h |
index b390402b00caf0a98fa06fabb6a5c13159bb0001..5e8dd7d5c52cafb1cfeca3bb24fc3f5bb0ba99cf 100644 |
--- a/webkit/renderer/cpp_variant.h |
+++ b/content/renderer/cpp_variant.h |
@@ -2,6 +2,9 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#ifndef CONTENT_RENDERER_CPP_VARIANT_H_ |
+#define CONTENT_RENDERER_CPP_VARIANT_H_ |
+ |
/* |
This file contains the declaration for CppVariant, a type used by C++ classes |
that are to be bound to JavaScript objects. |
@@ -15,19 +18,16 @@ |
For a usage example, see cpp_binding_example.{h|cc}. |
*/ |
-#ifndef WEBKIT_RENDERER_CPP_VARIANT_H__ |
-#define WEBKIT_RENDERER_CPP_VARIANT_H__ |
- |
#include <string> |
#include <vector> |
#include "base/basictypes.h" |
+#include "content/common/content_export.h" |
#include "third_party/npapi/bindings/npruntime.h" |
-#include "webkit/renderer/webkit_renderer_export.h" |
-namespace webkit_glue { |
+namespace content { |
-class WEBKIT_RENDERER_EXPORT CppVariant : public NPVariant { |
+class CONTENT_EXPORT CppVariant : public NPVariant { |
public: |
CppVariant(); |
~CppVariant(); |
@@ -107,10 +107,12 @@ class WEBKIT_RENDERER_EXPORT CppVariant : public NPVariant { |
// invoked. Returns whether the method was successfully invoked. If the |
// method was invoked successfully, any return value is stored in the |
// CppVariant specified by result. |
- bool Invoke(const std::string& method, const CppVariant* args, |
- uint32 arg_count, CppVariant& result) const; |
+ bool Invoke(const std::string& method, |
+ const CppVariant* args, |
+ uint32 arg_count, |
+ CppVariant& result) const; |
}; |
-} // namespace webkit_glue |
+} // namespace content |
-#endif // WEBKIT_RENDERER_CPP_VARIANT_H__ |
+#endif // CONTENT_RENDERER_CPP_VARIANT_H_ |