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

Fix linting errors.

Browse source
This commit is contained in:
Rob Brackett 2016-04-19 19:20:59 -07:00
parent 64a84dee3b
commit 942971b01a
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -816,7 +816,7 @@ base::string16 WebContents::GetTitle() const {
bool WebContents::IsLoading() const { bool WebContents::IsLoading() const {
return web_contents()->IsLoading(); return web_contents()->IsLoading();
} }
bool WebContents::IsLoadingMainFrame() const { bool WebContents::IsLoadingMainFrame() const {
return is_loading_main_frame_; return is_loading_main_frame_;
} }

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

@ -224,18 +224,21 @@ class WebContents : public mate::TrackableObject<WebContents>,
int error_code, int error_code,
const base::string16& error_description, const base::string16& error_description,
bool was_ignored_by_handler) override; bool was_ignored_by_handler) override;
void DidFailProvisionalLoad(content::RenderFrameHost* render_frame_host, void DidFailProvisionalLoad(
const GURL& validated_url, content::RenderFrameHost* render_frame_host,
int error_code, const GURL& validated_url,
const base::string16& error_description, int error_code,
bool was_ignored_by_handler) override; const base::string16& error_description,
void DidStartProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host, bool was_ignored_by_handler) override;
const GURL& validated_url, void DidStartProvisionalLoadForFrame(
bool is_error_page, content::RenderFrameHost* render_frame_host,
bool is_iframe_srcdoc) override; const GURL& validated_url,
void DidCommitProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host, bool is_error_page,
const GURL& url, bool is_iframe_srcdoc) override;
ui::PageTransition transition_type) override; void DidCommitProvisionalLoadForFrame(
content::RenderFrameHost* render_frame_host,
const GURL& url,
ui::PageTransition transition_type) override;
void DidStartLoading() override; void DidStartLoading() override;
void DidStopLoading() override; void DidStopLoading() override;
void DidGetResourceResponseStart( void DidGetResourceResponseStart(