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

Unified Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 187843005: Remove stale frame ID references for RequestTransferURL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove incorrect check. Created 6 years, 10 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/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index bca2d4a534c1cc26e2d169f67153d409a5cc6fe8..3fb633f06bc00d9a1d22e3fb666fa8623ccda8be 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -327,6 +327,9 @@ void RenderFrameHostManager::SwappedOut(RenderViewHost* render_view_host) {
GURL transfer_url = pending_nav_params_->transfer_url_chain.back();
pending_nav_params_->transfer_url_chain.pop_back();
+ // We use GetMainFrame here because this version of SwappedOut is only
+ // called for the main frame. We will remove it in favor of the frame
+ // specific version.
RenderFrameHostImpl* render_frame_host =
static_cast<RenderFrameHostImpl*>(render_view_host->GetMainFrame());
@@ -340,7 +343,6 @@ void RenderFrameHostManager::SwappedOut(RenderViewHost* render_view_host) {
pending_nav_params_->referrer,
pending_nav_params_->page_transition,
CURRENT_TAB,
- pending_nav_params_->render_frame_id,
pending_nav_params_->global_request_id,
pending_nav_params_->should_replace_current_entry,
true);
@@ -393,7 +395,6 @@ void RenderFrameHostManager::SwappedOutFrame(
pending_nav_params_->referrer,
pending_nav_params_->page_transition,
CURRENT_TAB,
- pending_nav_params_->render_frame_id,
pending_nav_params_->global_request_id,
false,
true);

Powered by Google App Engine
This is Rietveld 408576698