Index: content/renderer/pepper/npobject_var.h |
=================================================================== |
--- content/renderer/pepper/npobject_var.h (revision 213482) |
+++ content/renderer/pepper/npobject_var.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_NPOBJECT_VAR_H_ |
-#define WEBKIT_PLUGINS_PPAPI_NPOBJECT_VAR_H_ |
+#ifndef CONTENT_RENDERER_PEPPER_NPOBJECT_VAR_H_ |
+#define CONTENT_RENDERER_PEPPER_NPOBJECT_VAR_H_ |
#include <string> |
#include "base/compiler_specific.h" |
#include "ppapi/c/pp_instance.h" |
#include "ppapi/shared_impl/var.h" |
-#include "webkit/plugins/webkit_plugins_export.h" |
+#include "content/common/content_export.h" |
typedef struct NPObject NPObject; |
typedef struct _NPVariant NPVariant; |
@@ -34,8 +34,6 @@ |
// NPObjectVar. |
NPObjectVar(PP_Instance instance, NPObject* np_object); |
- virtual ~NPObjectVar(); |
- |
// Var overrides. |
virtual NPObjectVar* AsNPObjectVar() OVERRIDE; |
virtual PP_VarType GetType() const OVERRIDE; |
@@ -53,9 +51,11 @@ |
// Helper function that converts a PP_Var to an object. This will return NULL |
// if the PP_Var is not of object type or the object is invalid. |
- WEBKIT_PLUGINS_EXPORT static scoped_refptr<NPObjectVar> FromPPVar(PP_Var var); |
+ CONTENT_EXPORT static scoped_refptr<NPObjectVar> FromPPVar(PP_Var var); |
private: |
+ virtual ~NPObjectVar(); |
+ |
// Possibly 0 if the object has outlived its instance. |
PP_Instance pp_instance_; |
@@ -68,4 +68,4 @@ |
} // namespace |
-#endif // WEBKIT_PLUGINS_PPAPI_NPOBJECT_VAR_H_ |
+#endif // CONTENT_RENDERER_PEPPER_NPOBJECT_VAR_H_ |