Index: webkit/glue/cpp_bound_class.cc |
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc |
index d58fc4e5e69b9213636c10c81a556c7b70a410fc..c5d15b6c0cc34298a4937310a3affe64d2ce8bc0 100644 |
--- a/webkit/glue/cpp_bound_class.cc |
+++ b/webkit/glue/cpp_bound_class.cc |
@@ -319,7 +319,7 @@ CppVariant* CppBoundClass::GetAsCppVariant() { |
} |
void CppBoundClass::BindToJavascript(WebFrame* frame, |
- const std::wstring& classname) { |
+ const std::string& 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); |
@@ -328,7 +328,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(WideToUTF16Hack(classname), |
+ frame->bindToWindowObject(ASCIIToUTF16(classname), |
viettrungluu
2010/12/03 02:00:16
I was going to say that maybe we should be using U
|
NPVARIANT_TO_OBJECT(*GetAsCppVariant())); |
bound_to_frame_ = true; |
} |