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

Merge pull request #3875 from deepak1556/history_navigation_patch

Browse source 
navigaton: handle history operations from renderer
This commit is contained in:
Cheng Zhao 2015-12-21 18:18:45 +08:00
commit fa8d251370
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -421,6 +421,11 @@ bool WebContents::HandleContextMenu(const content::ContextMenuParams& params) {
return true;
}
bool WebContents::OnGoToEntryOffset(int offset) {
GoToOffset(offset);
return false;
}
void WebContents::BeforeUnloadFired(const base::TimeTicks& proceed_time) {
// Do nothing, we override this method just to avoid compilation error since
// there are two virtual functions named BeforeUnloadFired.

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

@ -186,6 +186,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
void RendererUnresponsive(content::WebContents* source) override;
void RendererResponsive(content::WebContents* source) override;
bool HandleContextMenu(const content::ContextMenuParams& params) override;
bool OnGoToEntryOffset(int offset) override;
// content::WebContentsObserver:
void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;