content/browser/frame_host/interstitial_page_impl.cc - Issue 1008913002: Remove RenderViewHost parameter from WebContentsObserver::Did{Start|Stop}Loading.

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: content/browser/frame_host/interstitial_page_impl.cc

Issue 1008913002: Remove RenderViewHost parameter from WebContentsObserver::Did{Start|Stop}Loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Android + Review comments Created 5 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 | « content/browser/android/web_contents_observer_proxy.cc ('k') | content/browser/frame_host/navigation_controller_delegate.h » ('j') | extensions/browser/guest_view/guest_view_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/interstitial_page_impl.cc

diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc

index 1324c7321a9073ec4348cb5e7388c043f817f5d1..b836847ae22f67244aef33c2fed5accf6d2a417f 100644

--- a/content/browser/frame_host/interstitial_page_impl.cc

+++ b/content/browser/frame_host/interstitial_page_impl.cc

@@ -483,8 +483,7 @@ void InterstitialPageImpl::DidNavigate(

// as complete. Without this, navigating in a UI test to a URL that triggers

// an interstitial would hang.

web_contents_was_loading_ = controller_->delegate()->IsLoading();

- controller_->delegate()->SetIsLoading(

- controller_->delegate()->GetRenderViewHost(), false, true, NULL);

+ controller_->delegate()->SetIsLoading(false, true, NULL);

}

RendererPreferences InterstitialPageImpl::GetRendererPrefs(

@@ -591,8 +590,7 @@ void InterstitialPageImpl::Proceed() {

// Resumes the throbber, if applicable.

if (web_contents_was_loading_)

- controller_->delegate()->SetIsLoading(

- controller_->delegate()->GetRenderViewHost(), true, true, NULL);

+ controller_->delegate()->SetIsLoading(true, true, NULL);

// If this is a new navigation, the old page is going away, so we cancel any

// blocked requests for it. If it is not a new navigation, then it means the