Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(689)

Unified Diff: webkit/glue/cpp_bound_class.cc

Issue 164225: Switch to WebFrame from the WebKit API.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/cpp_bound_class.h ('k') | webkit/glue/cpp_bound_class_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/cpp_bound_class.cc
===================================================================
--- webkit/glue/cpp_bound_class.cc (revision 22886)
+++ webkit/glue/cpp_bound_class.cc (working copy)
@@ -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 @@
// 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;
}
« no previous file with comments | « webkit/glue/cpp_bound_class.h ('k') | webkit/glue/cpp_bound_class_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698