| Index: content/browser/webui/web_ui_impl.cc
|
| diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc
|
| index 3f06293ecd64801d4d2f4c58cfa1518f25118474..5e080a65aa73081aeb67164b71a9893cbcede584 100644
|
| --- a/content/browser/webui/web_ui_impl.cc
|
| +++ b/content/browser/webui/web_ui_impl.cc
|
| @@ -55,17 +55,21 @@ const WebUI::TypeID WebUI::kNoWebUI = NULL;
|
| base::string16 WebUI::GetJavascriptCall(
|
| const std::string& function_name,
|
| const std::vector<const base::Value*>& arg_list) {
|
| - base::string16 parameters;
|
| + base::string16 result(base::ASCIIToUTF16(function_name));
|
| + result.push_back('(');
|
| +
|
| std::string json;
|
| for (size_t i = 0; i < arg_list.size(); ++i) {
|
| if (i > 0)
|
| - parameters += base::char16(',');
|
| + result.push_back(',');
|
|
|
| base::JSONWriter::Write(*arg_list[i], &json);
|
| - parameters += base::UTF8ToUTF16(json);
|
| + result.append(base::UTF8ToUTF16(json));
|
| }
|
| - return base::ASCIIToUTF16(function_name) +
|
| - base::char16('(') + parameters + base::char16(')') + base::char16(';');
|
| +
|
| + result.push_back(')');
|
| + result.push_back(';');
|
| + return result;
|
| }
|
|
|
| WebUIImpl::WebUIImpl(WebContents* contents, const std::string& frame_name)
|
|
|