summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 00:18:20 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 00:18:20 +0000
commit0a387477cb01e74f953980b95277f27974ac718e (patch)
tree7c63223e2948cc9494d8e0100d7a7a961d22eeb2 /chrome/browser/browser.cc
parent5eed8a5493c225fdf665b6981329a905654a5060 (diff)
downloadchromium_src-0a387477cb01e74f953980b95277f27974ac718e.zip
chromium_src-0a387477cb01e74f953980b95277f27974ac718e.tar.gz
chromium_src-0a387477cb01e74f953980b95277f27974ac718e.tar.bz2
Changes around instant to verify if the page really supports instant
before sending down the instant script. If the page doesn't support instant we fallback to reloading urls. BUG=54833 TEST=none Review URL: http://codereview.chromium.org/3608009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 4d318a0..29eebb61 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -4141,7 +4141,7 @@ void Browser::TabRestoreServiceDestroyed(TabRestoreService* service) {
}
bool Browser::OpenInstant(WindowOpenDisposition disposition) {
- if (!instant() || !instant()->is_active())
+ if (!instant() || !instant()->is_active() || !instant()->IsCurrent())
return false;
if (disposition == CURRENT_TAB) {