Remove RenderViewHost parameter from WebContentsObserver::Did{Start|Stop}Loading.
This parameter is unused in almost every class derived from WebContentsObserver.
This will make refactoring the OnDid{Start|Stop}Loading IPCs from
WebContentsImpl to RenderFrameHostImpl simpler.
BUG=429399,450799
Review URL: https://codereview.chromium.org/1008913002
Cr-Commit-Position: refs/heads/master@{#321341}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9b4875c1..e4b6bafc 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3392,8 +3392,7 @@
// Notifies the RenderWidgetHost instance about the fact that the page is
// loading, or done loading.
-void WebContentsImpl::SetIsLoading(RenderViewHost* render_view_host,
- bool is_loading,
+void WebContentsImpl::SetIsLoading(bool is_loading,
bool to_different_document,
LoadNotificationDetails* details) {
if (is_loading == is_loading_)
@@ -3421,13 +3420,11 @@
if (is_loading) {
TRACE_EVENT_ASYNC_BEGIN1("browser,navigation", "WebContentsImpl Loading",
this, "URL", url);
- FOR_EACH_OBSERVER(WebContentsObserver, observers_,
- DidStartLoading(render_view_host));
+ FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidStartLoading());
} else {
TRACE_EVENT_ASYNC_END1("browser,navigation", "WebContentsImpl Loading",
this, "URL", url);
- FOR_EACH_OBSERVER(WebContentsObserver, observers_,
- DidStopLoading(render_view_host));
+ FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidStopLoading());
}
// TODO(avi): Remove. http://crbug.com/170921
@@ -3835,7 +3832,7 @@
if (delegate_)
delegate_->HideValidationMessage(this);
- SetIsLoading(rvh, false, true, NULL);
+ SetIsLoading(false, true, nullptr);
NotifyDisconnected();
SetIsCrashed(status, error_code);
@@ -3943,8 +3940,7 @@
void WebContentsImpl::DidStartLoading(RenderFrameHost* render_frame_host,
bool to_different_document) {
- SetIsLoading(render_frame_host->GetRenderViewHost(), true,
- to_different_document, NULL);
+ SetIsLoading(true, to_different_document, nullptr);
// Notify accessibility that the user is navigating away from the
// current document.
@@ -3980,8 +3976,7 @@
controller_.GetCurrentEntryIndex()));
}
- SetIsLoading(render_frame_host->GetRenderViewHost(), false, true,
- details.get());
+ SetIsLoading(false, true, details.get());
}
void WebContentsImpl::DidCancelLoading() {
