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

Unified Diff: webkit/glue/cpp_variant.cc

Issue 5631002: wstrings: convert CppVariant and CppBoundClass to not use wstring (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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
Index: webkit/glue/cpp_variant.cc
diff --git a/webkit/glue/cpp_variant.cc b/webkit/glue/cpp_variant.cc
index 8545bc1a7ee8708d6dbf144afd3f1e2ed89d9ed5..0d16cddbe946dc69c2ccbea542f7bfbd3d03b832 100644
--- a/webkit/glue/cpp_variant.cc
+++ b/webkit/glue/cpp_variant.cc
@@ -211,10 +211,9 @@ bool CppVariant::ToBoolean() const {
return value.boolValue;
}
-std::vector<std::wstring> CppVariant::ToStringVector() const {
-
+std::vector<std::string> CppVariant::ToStringVector() const {
DCHECK(isObject());
- std::vector<std::wstring> wstring_vector;
+ std::vector<std::string> string_vector;
NPObject* np_value = value.objectValue;
NPIdentifier length_id = WebBindings::getStringIdentifier("length");
@@ -242,7 +241,7 @@ std::vector<std::wstring> CppVariant::ToStringVector() const {
std::string string(
NPVARIANT_TO_STRING(index_value).UTF8Characters,
NPVARIANT_TO_STRING(index_value).UTF8Length);
- wstring_vector.push_back(UTF8ToWide(string));
+ string_vector.push_back(string);
viettrungluu 2010/12/03 02:00:16 Reading the code, I suppose it's clear that this i
}
WebBindings::releaseVariantValue(&index_value);
}
@@ -250,7 +249,7 @@ std::vector<std::wstring> CppVariant::ToStringVector() const {
}
}
}
- return wstring_vector;
+ return string_vector;
}
bool CppVariant::Invoke(const std::string& method, const CppVariant* args,

Powered by Google App Engine
This is Rietveld 408576698