From f95de3d6f3dc4a5e8dd4d0f16df48faf05e50fe5 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Thu, 21 Mar 2019 20:04:24 -0700 Subject: [PATCH] fix: RFH->ExecuteJavascript now requires a callback Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1492042 --- atom/browser/ui/inspectable_web_contents_impl.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/atom/browser/ui/inspectable_web_contents_impl.cc b/atom/browser/ui/inspectable_web_contents_impl.cc index cdea0da456..ed6dc741a9 100644 --- a/atom/browser/ui/inspectable_web_contents_impl.cc +++ b/atom/browser/ui/inspectable_web_contents_impl.cc @@ -429,7 +429,7 @@ void InspectableWebContentsImpl::CallClientFunction( } javascript.append(");"); GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript( - base::UTF8ToUTF16(javascript)); + base::UTF8ToUTF16(javascript), base::NullCallback()); } gfx::Rect InspectableWebContentsImpl::GetDevToolsBounds() const { @@ -476,7 +476,8 @@ void InspectableWebContentsImpl::LoadCompleted() { } base::string16 javascript = base::UTF8ToUTF16( "Components.dockController.setDockSide(\"" + dock_state_ + "\");"); - GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(javascript); + GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript( + javascript, base::NullCallback()); } if (view_->GetDelegate()) @@ -738,7 +739,8 @@ void InspectableWebContentsImpl::DispatchProtocolMessage( if (message.length() < kMaxMessageChunkSize) { base::string16 javascript = base::UTF8ToUTF16("DevToolsAPI.dispatchMessage(" + message + ");"); - GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(javascript); + GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript( + javascript, base::NullCallback()); return; }