diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /webkit/glue/cpp_variant.cc | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'webkit/glue/cpp_variant.cc')
| -rw-r--r-- | webkit/glue/cpp_variant.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/webkit/glue/cpp_variant.cc b/webkit/glue/cpp_variant.cc index 8545bc1..0d16cdd 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); } 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, |