diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-29 19:19:06 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-29 19:19:06 +0000 |
| commit | d497b0781cb67b0d7359a633d88c1ada077992aa (patch) | |
| tree | a53748014d4d8f9265a5c8e266d0fd4d7639cd0c /chrome/browser/browser.h | |
| parent | 53d1edcbd0c3fc30b5e3af6529a516c41ba8debe (diff) | |
| download | chromium_src-d497b0781cb67b0d7359a633d88c1ada077992aa.zip chromium_src-d497b0781cb67b0d7359a633d88c1ada077992aa.tar.gz chromium_src-d497b0781cb67b0d7359a633d88c1ada077992aa.tar.bz2 | |
Fix a regression appearing in r41875 where navigating back from an interstitial page wouldn't work.
Also, factor out a method WindowDispositionShouldOpenNewTab that's used to decide if a given window disposition opens in a new tab or the current tab.
BUG=39248
TEST=SSLUITest.TestHTTPSExpiredCertAndGoBackViaButton, SSLUITest.TestHTTPSExpiredCertAndGoBackViaMenu, manual test: Go to www.google.com, then to https://ebay.com to show the HTTPS interstitial, then navigate back using the toolbar.
Review URL: http://codereview.chromium.org/1406001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
| -rw-r--r-- | chrome/browser/browser.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index 51470f7..801f3cd 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -821,6 +821,9 @@ class Browser : public TabStripModelDelegate, // Shared code between Reload() and ReloadAll(). void ReloadInternal(bool ignore_cache); + // Return true if the window dispositions means opening a new tab. + bool ShouldOpenNewTabForWindowDisposition(WindowOpenDisposition disposition); + // Depending on the disposition, return the |NavigationController| for the // current tab or clone the current tab and return its |NavigationController|. NavigationController& GetOrCloneNavigationControllerForDisposition( |