Index: chrome/renderer/dom_ui_bindings.cc |
diff --git a/chrome/renderer/dom_ui_bindings.cc b/chrome/renderer/dom_ui_bindings.cc |
index 5ca2e573d1467fbe265b8ee98a98605d282d660e..7fb18159e3d56d1425e40500598fb42ca0792407 100644 |
--- a/chrome/renderer/dom_ui_bindings.cc |
+++ b/chrome/renderer/dom_ui_bindings.cc |
@@ -6,7 +6,6 @@ |
#include "base/json/json_writer.h" |
#include "base/stl_util-inl.h" |
-#include "base/utf_string_conversions.h" |
#include "base/values.h" |
#include "chrome/common/render_messages.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" |
@@ -43,13 +42,10 @@ void DOMUIBindings::send(const CppArgumentList& args, CppVariant* result) { |
if (args.size() == 2) { |
if (!args[1].isObject()) |
return; |
- // TODO(evanm): we ought to support more than just sending arrays of |
- // strings, but it's not yet necessary for the current code. |
- std::vector<std::wstring> strings = args[1].ToStringVector(); |
+ std::vector<std::string> strings = args[1].ToStringVector(); |
ListValue value; |
for (size_t i = 0; i < strings.size(); ++i) { |
- // TODO(viettrungluu): remove conversion and utf_string_conversions.h |
- value.Append(Value::CreateStringValue(WideToUTF16Hack(strings[i]))); |
+ value.Append(Value::CreateStringValue(strings[i])); |
} |
viettrungluu
2010/12/03 02:00:16
You can probably omit the braces as well. (I don't
|
base::JSONWriter::Write(&value, /* pretty_print= */ false, &content); |
} |