diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 05:46:45 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 05:46:45 +0000 |
| commit | dd7daa80d25deb78ab365e28df4d93437357793b (patch) | |
| tree | fb4dd2331820f5e32ddeb7e2bfb731f0604fbc0d /webkit/glue/cpp_bound_class.cc | |
| parent | 64c40aa34646a198a04029ee6b78dd9559595dc5 (diff) | |
| download | chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.zip chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.tar.gz chromium_src-dd7daa80d25deb78ab365e28df4d93437357793b.tar.bz2 | |
Switch to WebFrame from the WebKit API.
I tried to avoid unnecessary changes in this CL to help make it easier to
review.
As part of this CL, glue/webtextinput* are folded into WebFrame / WebFrameImpl.
R=dglazkov
BUG=10034
TEST=none
Review URL: http://codereview.chromium.org/164225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/cpp_bound_class.cc')
| -rw-r--r-- | webkit/glue/cpp_bound_class.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index ef0a72d6..3e5c1e7 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -14,11 +14,14 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/string_util.h" #include "webkit/api/public/WebBindings.h" +#include "webkit/api/public/WebFrame.h" +#include "webkit/api/public/WebString.h" #include "webkit/glue/cpp_bound_class.h" -#include "webkit/glue/webframe.h" using WebKit::WebBindings; +using WebKit::WebFrame; // Our special NPObject type. We extend an NPObject with a pointer to a // CppBoundClass, which is just a C++ interface that we forward all NPObject @@ -246,6 +249,7 @@ void CppBoundClass::BindToJavascript(WebFrame* frame, // BindToWindowObject will take its own reference to the NPObject, and clean // up after itself. It will also (indirectly) register the object with V8, // so we must remember this so we can unregister it when we're destroyed. - frame->BindToWindowObject(classname, NPVARIANT_TO_OBJECT(*GetAsCppVariant())); + frame->bindToWindowObject(WideToUTF16Hack(classname), + NPVARIANT_TO_OBJECT(*GetAsCppVariant())); bound_to_frame_ = true; } |