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

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

Issue 132613002: Remove PrerenderTracker::TryCancel* methods and associated ones, since destruction of prerender onl… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: add unittest per mmenke Created 6 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_contents.cc
===================================================================
--- chrome/browser/prerender/prerender_contents.cc (revision 244175)
+++ chrome/browser/prerender/prerender_contents.cc (working copy)
@@ -666,22 +666,6 @@
if (prerendering_has_been_cancelled_)
return;
- if (child_id_ != -1 && route_id_ != -1) {
- // Cancel the prerender in the PrerenderTracker. This is needed
- // because destroy may be called directly from the UI thread without calling
- // TryCancel(). This is difficult to completely avoid, since prerendering
- // can be cancelled before a RenderView is created.
- bool is_cancelled = prerender_manager()->prerender_tracker()->TryCancel(
- child_id_, route_id_, final_status);
- CHECK(is_cancelled);
-
- // A different final status may have been set already from another thread.
- // If so, use it instead.
- if (!prerender_manager()->prerender_tracker()->
- GetFinalStatus(child_id_, route_id_, &final_status)) {
- NOTREACHED();
- }
- }
SetFinalStatus(final_status);
prerendering_has_been_cancelled_ = true;
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698