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-14 15:30:40 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 15:30:40 +0000
commitc65e2f15891448a06a89c7a2e0e9aa74d1a44c67 (patch)
tree0a8f6b8d60b332a9d4c60f85046f8a3f7ba3e96d /chrome/browser/browser.cc
parent87996f6636dd308b649e38e7b83df05045e62b81 (diff)
downloadchromium_src-c65e2f15891448a06a89c7a2e0e9aa74d1a44c67.zip
chromium_src-c65e2f15891448a06a89c7a2e0e9aa74d1a44c67.tar.gz
chromium_src-c65e2f15891448a06a89c7a2e0e9aa74d1a44c67.tar.bz2
Fixes instant so that it correctly deals with child contents. I've
changed around BlockedPopupContainer so that it can handle any types and made TabContents offer a mode to block all child content. BUG=58927 TEST=enable instant, go to a site that would normally show a popup on entering (or explicitly enable all popups). While typing in the omnibox the popup shouldn't appear, but as soon as you commit the instant result it should appear. Review URL: http://codereview.chromium.org/3694005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index c4f0b2a..23ead52 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -4211,6 +4211,7 @@ bool Browser::OpenInstant(WindowOpenDisposition disposition) {
instant()->last_transition_type(),
disposition == NEW_FOREGROUND_TAB ? TabStripModel::ADD_SELECTED :
TabStripModel::ADD_NONE);
+ instant()->CompleteRelease(preview_contents);
return true;
}
// The omnibox currently doesn't use other dispositions, so we don't attempt