diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-20 14:17:47 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:26:38 +0200 |
commit | 9cfde2edf4736ae9533e7e1fac495a23ad905419 (patch) | |
tree | 4eca639f54719a8824a527ee6a40fb13b462b110 /src/core/devtools_frontend_qt.cpp | |
parent | 0a01998411de6a46af8d0b0ae13b8f401cd14a4b (diff) |
Adaptations for Chromium 75
Change-Id: Idad08244e0c749a9f70f5eb9f8cd236039b941b3
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/devtools_frontend_qt.cpp')
-rw-r--r-- | src/core/devtools_frontend_qt.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/devtools_frontend_qt.cpp b/src/core/devtools_frontend_qt.cpp index 330730f9c..d3f46f648 100644 --- a/src/core/devtools_frontend_qt.cpp +++ b/src/core/devtools_frontend_qt.cpp @@ -375,7 +375,8 @@ void DevToolsFrontendQt::HandleMessageFromDevToolsFrontend(const std::string &me return; m_agentHost->DispatchProtocolMessage(this, protocol_message); } else if (method == "loadCompleted") { - web_contents()->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16("DevToolsAPI.setUseSoftMenu(true);")); + web_contents()->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16("DevToolsAPI.setUseSoftMenu(true);"), + base::NullCallback()); } else if (method == "loadNetworkResource" && params->GetSize() == 3) { // TODO(pfeldman): handle some of the embedder messages in content. std::string url; @@ -453,7 +454,8 @@ void DevToolsFrontendQt::HandleMessageFromDevToolsFrontend(const std::string &me } else if (method == "clearPreferences") { ClearPreferences(); } else if (method == "requestFileSystems") { - web_contents()->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16("DevToolsAPI.fileSystemsLoaded([]);")); + web_contents()->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16("DevToolsAPI.fileSystemsLoaded([]);"), + base::NullCallback()); } else if (method == "reattach") { m_agentHost->DetachClient(this); m_agentHost->AttachClient(this); @@ -498,7 +500,7 @@ void DevToolsFrontendQt::DispatchProtocolMessage(content::DevToolsAgentHost *age base::EscapeJSONString(message, true, ¶m); std::string code = "DevToolsAPI.dispatchMessage(" + param + ");"; base::string16 javascript = base::UTF8ToUTF16(code); - web_contents()->GetMainFrame()->ExecuteJavaScript(javascript); + web_contents()->GetMainFrame()->ExecuteJavaScript(javascript, base::NullCallback()); return; } @@ -509,7 +511,7 @@ void DevToolsFrontendQt::DispatchProtocolMessage(content::DevToolsAgentHost *age std::string code = "DevToolsAPI.dispatchMessageChunk(" + param + "," + std::to_string(pos ? 0 : total_size) + ");"; base::string16 javascript = base::UTF8ToUTF16(code); - web_contents()->GetMainFrame()->ExecuteJavaScript(javascript); + web_contents()->GetMainFrame()->ExecuteJavaScript(javascript, base::NullCallback()); } } @@ -533,7 +535,7 @@ void DevToolsFrontendQt::CallClientFunction(const std::string &function_name, } } javascript.append(");"); - web_contents()->GetMainFrame()->ExecuteJavaScript(base::UTF8ToUTF16(javascript)); + web_contents()->GetMainFrame()->ExecuteJavaScript(base::UTF8ToUTF16(javascript), base::NullCallback()); } void DevToolsFrontendQt::SendMessageAck(int request_id, const base::Value *arg) |