From 2bf52ed344c1036c5b35100e18c23b0698b750fc Mon Sep 17 00:00:00 2001 From: "jcampan@chromium.org" Date: Mon, 27 Apr 2009 23:59:39 +0000 Subject: When navigating from an interstitial to another page with an interstitial, we should not discard the non committed entries, as this would cause the new navigation pending entry to go away. BUG=9791 TEST=Visit a page with an SSL error (ex: https://ebay.com). Focus the location bar and press enter (to navigate again to that page). The interstitial should be shown again and the location bar should show the URL. Also ensure that interstitial pages (SSL and safe browsing) still work as expected. Review URL: http://codereview.chromium.org/100002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14687 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/tab_contents/interstitial_page.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'chrome/browser/tab_contents/interstitial_page.h') diff --git a/chrome/browser/tab_contents/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h index 1c42520..1e35ea4 100644 --- a/chrome/browser/tab_contents/interstitial_page.h +++ b/chrome/browser/tab_contents/interstitial_page.h @@ -151,6 +151,12 @@ class InterstitialPage : public NotificationObserver, // which case a transient navigation entry is created). bool new_navigation_; + // Whether we should discard the pending navigation entry when not proceeding. + // This is to deal with cases where |new_navigation_| is true but a new + // pending entry was created since this interstitial was shown and we should + // not discard it. + bool should_discard_pending_nav_entry_; + // Whether this interstitial is enabled. See Disable() for more info. bool enabled_; -- cgit v1.1