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

Remove was_ignored_by_handler from frame_messages.h

Browse source 
https://chromium-review.googlesource.com/587701
This commit is contained in:
Aleksei Kuzmin 2017-11-23 13:53:47 +01:00 • committed by Cheng Zhao
parent 91a339b625
commit 8f78bd3307
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/api/atom_api_web_contents.cc
View file

@ -811,8 +811,7 @@ void WebContents::DidFinishLoad(content::RenderFrameHost* render_frame_host,
void WebContents::DidFailLoad(content::RenderFrameHost* render_frame_host, void WebContents::DidFailLoad(content::RenderFrameHost* render_frame_host,
const GURL& url, const GURL& url,
int error_code, int error_code,
const base::string16& error_description, const base::string16& error_description) {
bool was_ignored_by_handler) {
bool is_main_frame = !render_frame_host->GetParent(); bool is_main_frame = !render_frame_host->GetParent();
Emit("did-fail-load", error_code, error_description, url, is_main_frame); Emit("did-fail-load", error_code, error_description, url, is_main_frame);
} }

3
atom/browser/api/atom_api_web_contents.h
View file

@ -343,8 +343,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
void DidFailLoad(content::RenderFrameHost* render_frame_host, void DidFailLoad(content::RenderFrameHost* render_frame_host,
const GURL& validated_url, const GURL& validated_url,
int error_code, int error_code,
const base::string16& error_description, const base::string16& error_description) override;
bool was_ignored_by_handler) override;
void DidStartLoading() override; void DidStartLoading() override;
void DidStopLoading() override; void DidStopLoading() override;
void DidGetResourceResponseStart( void DidGetResourceResponseStart(