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

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

Issue 118553006: Move DidFailProvisionalLoad handling from RenderView(Host) to RenderFrame(Host). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Huh? Created 6 years, 12 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
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 1178bf924891e3ca6c1b4041e7e74f25a170398a..192099fd39a26bb9e644869351b04fe894cfa4c6 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2164,6 +2164,22 @@ void WebContentsImpl::DidStartProvisionalLoad(
}
}
+void WebContentsImpl::DidFailProvisionalLoadWithError(
+ RenderFrameHostImpl* render_frame_host,
+ const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
+ GURL validated_url(params.url);
+ FOR_EACH_OBSERVER(
+ WebContentsObserver,
+ observers_,
+ DidFailProvisionalLoad(params.frame_id,
+ params.frame_unique_name,
+ params.is_main_frame,
+ validated_url,
+ params.error_code,
+ params.error_description,
+ render_frame_host->render_view_host()));
+}
+
void WebContentsImpl::NotifyChangedNavigationState(
InvalidateTypes changed_flags) {
NotifyNavigationStateChanged(changed_flags);
@@ -2199,9 +2215,10 @@ void WebContentsImpl::DidRedirectProvisionalLoad(
render_view_host));
}
+/*
Charlie Reis 2014/01/06 18:13:35 Don't forget to delete this now that it's moved.
nasko 2014/01/06 18:47:03 Done.
void WebContentsImpl::DidFailProvisionalLoadWithError(
RenderViewHost* render_view_host,
- const ViewHostMsg_DidFailProvisionalLoadWithError_Params& params) {
+ const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec()
<< ", error_code: " << params.error_code
<< ", error_description: " << params.error_description
@@ -2263,6 +2280,7 @@ void WebContentsImpl::DidFailProvisionalLoadWithError(
params.error_description,
render_view_host));
}
+*/
void WebContentsImpl::OnDidLoadResourceFromMemoryCache(
const GURL& url,

Powered by Google App Engine
This is Rietveld 408576698