Switch to WebFrame from the WebKit API....

webkit/glue/cpp_bound_class.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains definitions for CppBoundClass
 
 // Here's the control flow of a JS method getting forwarded to a class.
 // - Something calls our NPObject with a function like "Invoke".
 // - CppNPObject's static invoke() function forwards it to its attached
 //   CppBoundClass's Invoke() method.
 // - CppBoundClass has then overridden Invoke() to look up the function
 //   name in its internal map of methods, and then calls the appropriate
 //   method.
 
 #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
 // callbacks to.
 struct CppNPObject {
   NPObject parent;  // This must be the first field in the struct.
   CppBoundClass* bound_class;
 
   //
   // All following objects and functions are static, and just used to interface
@@ skipping 207 matching lines @@
 void CppBoundClass::BindToJavascript(WebFrame* frame,
                                      const std::wstring& classname) {
 #if WEBKIT_USING_JSC
 #error "This is not going to work anymore...but it's not clear what the solution is...or if it's still necessary."
   JSC::JSLock lock(false);
 #endif
 
   // 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;
 }