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

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

Issue 7034043: Prerender/Instant interopability. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
Index: chrome/browser/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 5c5db3ba745a800a3930603f3dd7bd26cf6988dd..2f040d86204fbdeb65abb55761d086e9d1da138b 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -506,6 +506,7 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tab_contents,
}
VLOG(1) << "Checking for prerender with NEW code";
DCHECK(CalledOnValidThread());
+
scoped_ptr<PrerenderContents> prerender_contents(
GetEntryButNotSpecifiedTC(url, tab_contents));
if (prerender_contents.get() == NULL)
@@ -553,7 +554,6 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tab_contents,
false);
old_tab_contents->delegate()->SwapTabContents(old_tab_contents,
new_tab_contents);
-
// See if we have any pending prerender requests for this routing id and start
// the preload if we do.
std::pair<int, int> child_route_pair = std::make_pair(child_id, route_id);
« chrome/browser/instant/instant_loader.cc ('K') | « chrome/browser/instant/instant_loader.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698