From 8f78bd3307aa7cf783492ef30f254bdf6c7649ca Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Thu, 23 Nov 2017 13:53:47 +0100 Subject: [PATCH] Remove was_ignored_by_handler from frame_messages.h https://chromium-review.googlesource.com/587701 --- atom/browser/api/atom_api_web_contents.cc | 3 +-- atom/browser/api/atom_api_web_contents.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index 86851826bb4a..cca172f3cecc 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -811,8 +811,7 @@ void WebContents::DidFinishLoad(content::RenderFrameHost* render_frame_host, void WebContents::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& url, int error_code, - const base::string16& error_description, - bool was_ignored_by_handler) { + const base::string16& error_description) { bool is_main_frame = !render_frame_host->GetParent(); Emit("did-fail-load", error_code, error_description, url, is_main_frame); } diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h index 5d0f9ea3df06..ce79b93e6e00 100644 --- a/atom/browser/api/atom_api_web_contents.h +++ b/atom/browser/api/atom_api_web_contents.h @@ -343,8 +343,7 @@ class WebContents : public mate::TrackableObject, void DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code, - const base::string16& error_description, - bool was_ignored_by_handler) override; + const base::string16& error_description) override; void DidStartLoading() override; void DidStopLoading() override; void DidGetResourceResponseStart(