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

Unified Diff: chrome/browser/prerender/prerender_manager.cc

Issue 565263005: Remove the use of ProvisionalChangeToMainFrameUrl from prerender code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@redirsupervised
Patch Set: better? Created 6 years, 3 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/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 63c2cd87cac3eaf9113719bcc207b43d36255d1e..8d3a617164b7b72bd65b2ea502f0876fe1ef1819 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -1093,17 +1093,6 @@ void PrerenderManager::PendingSwap::AboutToNavigateRenderView(
target_route_id_, url_);
}
-void PrerenderManager::PendingSwap::ProvisionalChangeToMainFrameUrl(
- const GURL& url,
- content::RenderFrameHost* render_frame_host) {
- // We must only cancel the pending swap if the |url| navigated to is not
- // the URL being attempted to be swapped in. That's because in the normal
- // flow, a ProvisionalChangeToMainFrameUrl will happen for the URL attempted
- // to be swapped in immediately after the pending swap has issued its merge.
- if (url != url_)
tburkard 2014/09/17 14:19:42 How about this logic here? Why was this removed co
tburkard 2014/09/17 14:21:02 Ah I see that davidben@ mentioned that this may be
davidben 2014/09/17 15:08:30 That logic is actually a pretty good indication th
tburkard 2014/09/18 09:36:04 Saying a certain code path is not needed because i
Avi (use Gerrit) 2014/09/18 21:00:21 OK, I'm putting it back.
davidben 2014/09/18 22:14:21 Heh. Well, the better answer is that DidFailProvis
- prerender_data_->ClearPendingSwap();
-}
-
void PrerenderManager::PendingSwap::DidCommitProvisionalLoadForFrame(
content::RenderFrameHost* render_frame_host,
const GURL& validated_url,

Powered by Google App Engine
This is Rietveld 408576698