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

Renamed LoadCommittedDetails.is_in_page to is_same_document.

Browse source 
https://codereview.chromium.org/2841833002
This commit is contained in:
Aleksei Kuzmin 2017-08-08 03:49:20 +03:00 committed by Cheng Zhao
parent 90b0984a14
commit 650902c656
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -839,10 +839,10 @@ void WebContents::DidFinishNavigation(
bool is_main_frame = navigation_handle->IsInMainFrame(); bool is_main_frame = navigation_handle->IsInMainFrame();
if (navigation_handle->HasCommitted() && !navigation_handle->IsErrorPage()) { if (navigation_handle->HasCommitted() && !navigation_handle->IsErrorPage()) {
auto url = navigation_handle->GetURL(); auto url = navigation_handle->GetURL();
bool is_in_page = navigation_handle->IsSameDocument(); bool is_same_document = navigation_handle->IsSameDocument();
if (is_main_frame && !is_in_page) { if (is_main_frame && !is_same_document) {
Emit("did-navigate", url); Emit("did-navigate", url);
} else if (is_in_page) { } else if (is_same_document) {
Emit("did-navigate-in-page", url, is_main_frame); Emit("did-navigate-in-page", url, is_main_frame);
} }
} else { } else {
@ -989,7 +989,7 @@ void WebContents::WebContentsDestroyed() {
void WebContents::NavigationEntryCommitted( void WebContents::NavigationEntryCommitted(
const content::LoadCommittedDetails& details) { const content::LoadCommittedDetails& details) {
Emit("navigation-entry-commited", details.entry->GetURL(), Emit("navigation-entry-commited", details.entry->GetURL(),
details.is_in_page, details.did_replace_entry); details.is_same_document, details.did_replace_entry);
} }
int64_t WebContents::GetID() const { int64_t WebContents::GetID() const {