Pass the render view host with all provisional load related callbacks on the web contents observer
There might be several provisional loads in different render view hosts going on, so the observers need to know where the signals came from
BUG=109792
TEST=none, just added the parameter everywhere
Review URL: https://chromiumcodereview.appspot.com/10392072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137534 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index ed3e103..196095a 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1521,7 +1521,8 @@
// Notify observers about the provisional change in the main frame URL.
FOR_EACH_OBSERVER(WebContentsObserver, observers_,
ProvisionalChangeToMainFrameUrl(validated_url,
- validated_opener_url));
+ validated_opener_url,
+ render_view_host));
}
}
@@ -1569,7 +1570,8 @@
// Notify observers about the provisional change in the main frame URL.
FOR_EACH_OBSERVER(WebContentsObserver, observers_,
ProvisionalChangeToMainFrameUrl(validated_target_url,
- validated_opener_url));
+ validated_opener_url,
+ render_view_host));
}
void WebContentsImpl::DidFailProvisionalLoadWithError(
@@ -1637,7 +1639,8 @@
params.is_main_frame,
validated_url,
params.error_code,
- params.error_description));
+ params.error_description,
+ render_view_host));
}
void WebContentsImpl::OnDidLoadResourceFromMemoryCache(
@@ -2175,7 +2178,7 @@
// Notify observers about the commit of the provisional load.
FOR_EACH_OBSERVER(WebContentsObserver, observers_,
DidCommitProvisionalLoadForFrame(params.frame_id,
- is_main_frame, params.url, transition_type));
+ is_main_frame, params.url, transition_type, rvh));
}
if (!did_navigate)
