Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1773)

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 10392072: Pass the render view host with all provisional load related callbacks on the web contents observer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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 | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | content/public/browser/web_contents_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index ed3e1036986f8e5242e53e2d41912f5699c3a4e1..196095ab2a23d2595b26b7523ccfeb094db0ab9c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1521,7 +1521,8 @@ void WebContentsImpl::DidStartProvisionalLoadForFrame(
// 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 @@ void WebContentsImpl::DidRedirectProvisionalLoad(
// 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 @@ void WebContentsImpl::DidFailProvisionalLoadWithError(
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 @@ void WebContentsImpl::DidNavigate(
// 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)
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | content/public/browser/web_contents_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698