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

Unified Diff: chrome/browser/renderer_host/render_view_host.cc

Issue 3561008: Implement the frame id required for the web navigation api. (Closed)
Patch Set: updates Created 10 years, 2 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: chrome/browser/renderer_host/render_view_host.cc
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index a702b082ff5b547df3e909ef849b61326805deb2..143bc1a7f099741711d9f2e8f2a2182b2affed7c 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -1166,7 +1166,8 @@ void RenderViewHost::OnMsgDidRunInsecureContent(
resource_delegate->DidRunInsecureContent(security_origin);
}
-void RenderViewHost::OnMsgDidStartProvisionalLoadForFrame(bool is_main_frame,
+void RenderViewHost::OnMsgDidStartProvisionalLoadForFrame(long long frame_id,
+ bool is_main_frame,
const GURL& url) {
GURL validated_url(url);
FilterURL(ChildProcessSecurityPolicy::GetInstance(),
@@ -1175,12 +1176,13 @@ void RenderViewHost::OnMsgDidStartProvisionalLoadForFrame(bool is_main_frame,
RenderViewHostDelegate::Resource* resource_delegate =
delegate_->GetResourceDelegate();
if (resource_delegate) {
- resource_delegate->DidStartProvisionalLoadForFrame(this, is_main_frame,
- validated_url);
+ resource_delegate->DidStartProvisionalLoadForFrame(
+ this, frame_id, is_main_frame, validated_url);
}
}
void RenderViewHost::OnMsgDidFailProvisionalLoadWithError(
+ long long frame_id,
bool is_main_frame,
int error_code,
const GURL& url,
@@ -1188,7 +1190,8 @@ void RenderViewHost::OnMsgDidFailProvisionalLoadWithError(
LOG(INFO) << "Failed Provisional Load: " << url.possibly_invalid_spec()
<< ", error_code: " << error_code
<< " is_main_frame: " << is_main_frame
- << " showing_repost_interstitial: " << showing_repost_interstitial;
+ << " showing_repost_interstitial: " << showing_repost_interstitial
+ << " frame_id: " << frame_id;
GURL validated_url(url);
FilterURL(ChildProcessSecurityPolicy::GetInstance(),
process()->id(), &validated_url);
@@ -1197,7 +1200,7 @@ void RenderViewHost::OnMsgDidFailProvisionalLoadWithError(
delegate_->GetResourceDelegate();
if (resource_delegate) {
resource_delegate->DidFailProvisionalLoadWithError(
- this, is_main_frame, error_code, validated_url,
+ this, frame_id, is_main_frame, error_code, validated_url,
showing_repost_interstitial);
}
}
« no previous file with comments | « chrome/browser/renderer_host/render_view_host.h ('k') | chrome/browser/renderer_host/render_view_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698