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

Side by Side Diff: content/browser/webui/web_ui_impl.cc

Issue 1131113004: Convert JsonWriter::Write to taking a const ref for the in-param (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another rebase Created 5 years, 7 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/webui/web_ui_impl.h" 5 #include "content/browser/webui/web_ui_impl.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
(...skipping 18 matching lines...) Expand all
29 // static 29 // static
30 base::string16 WebUI::GetJavascriptCall( 30 base::string16 WebUI::GetJavascriptCall(
31 const std::string& function_name, 31 const std::string& function_name,
32 const std::vector<const base::Value*>& arg_list) { 32 const std::vector<const base::Value*>& arg_list) {
33 base::string16 parameters; 33 base::string16 parameters;
34 std::string json; 34 std::string json;
35 for (size_t i = 0; i < arg_list.size(); ++i) { 35 for (size_t i = 0; i < arg_list.size(); ++i) {
36 if (i > 0) 36 if (i > 0)
37 parameters += base::char16(','); 37 parameters += base::char16(',');
38 38
39 base::JSONWriter::Write(arg_list[i], &json); 39 base::JSONWriter::Write(*arg_list[i], &json);
40 parameters += base::UTF8ToUTF16(json); 40 parameters += base::UTF8ToUTF16(json);
41 } 41 }
42 return base::ASCIIToUTF16(function_name) + 42 return base::ASCIIToUTF16(function_name) +
43 base::char16('(') + parameters + base::char16(')') + base::char16(';'); 43 base::char16('(') + parameters + base::char16(')') + base::char16(';');
44 } 44 }
45 45
46 WebUIImpl::WebUIImpl(WebContents* contents) 46 WebUIImpl::WebUIImpl(WebContents* contents)
47 : link_transition_type_(ui::PAGE_TRANSITION_LINK), 47 : link_transition_type_(ui::PAGE_TRANSITION_LINK),
48 bindings_(BINDINGS_POLICY_WEB_UI), 48 bindings_(BINDINGS_POLICY_WEB_UI),
49 web_contents_(contents) { 49 web_contents_(contents) {
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 } 250 }
251 251
252 void WebUIImpl::AddToSetIfFrameNameMatches( 252 void WebUIImpl::AddToSetIfFrameNameMatches(
253 std::set<RenderFrameHost*>* frame_set, 253 std::set<RenderFrameHost*>* frame_set,
254 RenderFrameHost* host) { 254 RenderFrameHost* host) {
255 if (host->GetFrameName() == frame_name_) 255 if (host->GetFrameName() == frame_name_)
256 frame_set->insert(host); 256 frame_set->insert(host);
257 } 257 }
258 258
259 } // namespace content 259 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_android.cc ('k') | content/common/gpu/gpu_command_buffer_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698