mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix API changes

Browse source
This commit is contained in:
Cheng Zhao 2015-09-02 15:16:34 +08:00
parent 5e004b4c24
commit 38a211db2e
8 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -282,13 +282,13 @@ void InspectableWebContentsImpl::CallClientFunction(const std::string& function_
std::string javascript = function_name + "(";
if (arg1) {
std::string json;
base::JSONWriter::Write(arg1, &json);
base::JSONWriter::Write(*arg1, &json);
javascript.append(json);
if (arg2) {
base::JSONWriter::Write(arg2, &json);
base::JSONWriter::Write(*arg2, &json);
javascript.append(", ").append(json);
if (arg3) {
base::JSONWriter::Write(arg3, &json);
base::JSONWriter::Write(*arg3, &json);
javascript.append(", ").append(json);
}
}
@ -586,7 +586,7 @@ bool InspectableWebContentsImpl::ShouldCreateWebContents(
int route_id,
int main_frame_route_id,
WindowContainerType window_container_type,
const base::string16& frame_name,
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
content::SessionStorageNamespace* session_storage_namespace) {