From ce701cd1471af1386f770cf18b25b7785d94d0b5 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Mon, 1 Aug 2011 21:47:04 +0000 Subject: Move Var and StringVar to the ppapi/shared_impl so they can be used in the proxy. This does not, however, actually use these in the proxy yet, I'll do that in a subsequent pass. ObjectVar is now renamed NPObjectVar and continues to be in webkit/plugins since it uses NPObjects. There will be a corresponding future class in the proxy for proxied objects. The TryCatch that was in var.h is now in npapi_glue.h Most of the rest of the change is updating namespaces. TEST=unit tests BUG=none Review URL: http://codereview.chromium.org/7488062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94986 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/plugins/ppapi/plugin_object.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'webkit/plugins/ppapi/plugin_object.cc') diff --git a/webkit/plugins/ppapi/plugin_object.cc b/webkit/plugins/ppapi/plugin_object.cc index b20b9ff..95d8fba 100644 --- a/webkit/plugins/ppapi/plugin_object.cc +++ b/webkit/plugins/ppapi/plugin_object.cc @@ -15,14 +15,16 @@ #include "ppapi/c/dev/ppp_class_deprecated.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_var.h" +#include "ppapi/shared_impl/var.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "webkit/plugins/ppapi/npapi_glue.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "webkit/plugins/ppapi/resource.h" #include "webkit/plugins/ppapi/string.h" -#include "webkit/plugins/ppapi/var.h" +using ppapi::StringVar; +using ppapi::Var; using WebKit::WebBindings; namespace webkit { -- cgit v1.1