summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-17 19:57:24 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-17 19:57:24 +0000
commit7cef64b495701e8ff17b2fbb6e632aa34eee450f (patch)
tree8af439034838b28edd0223010a1f6aad4b2f61ce /chrome/browser/browser.cc
parenta16d22388edff186095e37fecd5537beae88c7c9 (diff)
downloadchromium_src-7cef64b495701e8ff17b2fbb6e632aa34eee450f.zip
chromium_src-7cef64b495701e8ff17b2fbb6e632aa34eee450f.tar.gz
chromium_src-7cef64b495701e8ff17b2fbb6e632aa34eee450f.tar.bz2
Reverting 7149.
Review URL: http://codereview.chromium.org/15004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 862398d..87b3e9e 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -558,11 +558,8 @@ void Browser::GoBack() {
// If we are showing an interstitial, just hide it.
TabContents* current_tab = GetSelectedTabContents();
WebContents* web_contents = current_tab->AsWebContents();
- if (web_contents && web_contents->interstitial_page()) {
- // The GoBack() case is a special case when an interstitial is shown because
- // the "previous" page is still available, just hidden by the interstitial.
- // We treat the back as a "Don't proceed", this hides the interstitial and
- // reveals the previous page.
+ if (web_contents && web_contents->showing_interstitial_page()) {
+ // Pressing back on an interstitial page means "don't proceed".
web_contents->interstitial_page()->DontProceed();
return;
}