extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc - Issue 2716493004: Renamed NavigationHandle::IsSamePage to NavigationHandle::IsSameDocument

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

Issue 2716493004: Renamed NavigationHandle::IsSamePage to NavigationHandle::IsSameDocument (Closed)

Patch Set: Rebased Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « extensions/browser/extension_web_contents_observer.cc ('k') | extensions/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

index f28a9004571bf4b8a963d1515c04d0b09e031ef6..72d9b9f35a488b06d7e808fcd7219d744e726ecf 100644

--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

@@ -204,7 +204,7 @@ void MimeHandlerStreamManager::EmbedderObserver::RenderProcessGone(

void MimeHandlerStreamManager::EmbedderObserver::ReadyToCommitNavigation(

content::NavigationHandle* navigation_handle) {

- if (navigation_handle->IsSamePage() ||

+ if (navigation_handle->IsSameDocument() ||

!IsTrackedRenderFrameHost(navigation_handle->GetRenderFrameHost())) {

return;

}

@@ -221,8 +221,10 @@ void MimeHandlerStreamManager::EmbedderObserver::ReadyToCommitNavigation(

void MimeHandlerStreamManager::EmbedderObserver::DidStartNavigation(

content::NavigationHandle* navigation_handle) {

// If the top level frame is navigating away, clean up the stream.

- if (navigation_handle->IsInMainFrame() && !navigation_handle->IsSamePage())

+ if (navigation_handle->IsInMainFrame() &&

+ !navigation_handle->IsSameDocument()) {

AbortStream();

+ }

}

void MimeHandlerStreamManager::EmbedderObserver::RenderFrameHostChanged(

« no previous file with comments | « extensions/browser/extension_web_contents_observer.cc ('k') | extensions/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »