summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prerender/prerender_final_status.h
diff options
context:
space:
mode:
authordavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 20:56:55 +0000
committerdavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 20:56:55 +0000
commitab5871bc50be5c7d0c42ed7b33052f0c5617ffaf (patch)
tree25e2cd4b64a22829f3300c6f87ba36ab3d8d8aeb /chrome/browser/prerender/prerender_final_status.h
parent299b2b9627656df44a41f6dff700947d92baeb2a (diff)
downloadchromium_src-ab5871bc50be5c7d0c42ed7b33052f0c5617ffaf.zip
chromium_src-ab5871bc50be5c7d0c42ed7b33052f0c5617ffaf.tar.gz
chromium_src-ab5871bc50be5c7d0c42ed7b33052f0c5617ffaf.tar.bz2
Abort prerenders which try to create two navigation entries.
We do not currently patch up the history correctly. Let's try to fix this by just aborting prerenders which do this, rather than complicating the history merge function. UMA will tell us if this is a problem and if this case turns out to be important. This does not affect the following: - Calls to location.replace. - <meta http-equiv=refresh> redirects with a timeout under 1 second. - Code which sets location.href before the load event. BUG=305660 TEST=PrerenderBrowserTest.PrerenderNewNavigationEntry PrerenderBrowserTest.PrerenderLocationReplaceNavigateToFirst PrerenderBrowserTest.PrerenderLocationReplaceNavigateToSecond Review URL: https://codereview.chromium.org/68213005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_final_status.h')
-rw-r--r--chrome/browser/prerender/prerender_final_status.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/prerender/prerender_final_status.h b/chrome/browser/prerender/prerender_final_status.h
index 1d702d5..41ab465 100644
--- a/chrome/browser/prerender/prerender_final_status.h
+++ b/chrome/browser/prerender/prerender_final_status.h
@@ -59,6 +59,7 @@ enum FinalStatus {
FINAL_STATUS_PAGE_BEING_CAPTURED = 44,
FINAL_STATUS_BAD_DEFERRED_REDIRECT = 45,
FINAL_STATUS_NAVIGATION_UNCOMMITTED = 46,
+ FINAL_STATUS_NEW_NAVIGATION_ENTRY = 47,
FINAL_STATUS_MAX,
};