diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-15 15:39:50 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-15 15:39:50 +0000 |
| commit | 3e4812802665a1794f5457e340e740ef1e690ff9 (patch) | |
| tree | 9694e89ea8ed07e6702ffbdab47f60bc915627f5 /chrome/browser/ui/cocoa/browser_window_cocoa.h | |
| parent | f7d93399f3936d20832ec6f2ccfdc8caeb703540 (diff) | |
| download | chromium_src-3e4812802665a1794f5457e340e740ef1e690ff9.zip chromium_src-3e4812802665a1794f5457e340e740ef1e690ff9.tar.gz chromium_src-3e4812802665a1794f5457e340e740ef1e690ff9.tar.bz2 | |
Fixes bug in instant where we would end up incorrectly using the
preview when we shouldn't. Here's the sequence that would trigger it:
1. focus the omnibox (which triggers loading the InstantLoader).
2. Type in a string that'll autocomplete to a url.
3. Arrow over a search suggestion to a non-search entry.
4. Press enter.
When you arrow over a non-search we'll hide (what was
DestroyPreviewContentsAndLeaveActive) the preview. But if between
steps 3 and 4 we get a response back from the page with suggestions
we'll set displayable_ to true and think everything is up to
date. This leads to IsCurrent returning true when it isn't.
To fix this I've nuked is_active(), which was a bit confusing anyway
and added is_out_date_ (still confusing, but at least it's private).
BUG=100368
TEST=covered by test, see bug for test scenario.
R=sreeram@chromium.org,ben@chromium.org
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8298005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_cocoa.h')
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_window_cocoa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h index 670445a..3d3042c 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h @@ -111,7 +111,7 @@ class BrowserWindowCocoa : public BrowserWindow, bool ask_permission); virtual bool InPresentationMode(); virtual void ShowInstant(TabContentsWrapper* preview); - virtual void HideInstant(bool instant_is_active); + virtual void HideInstant(); virtual gfx::Rect GetInstantBounds(); virtual WindowOpenDisposition GetDispositionForPopupBounds( const gfx::Rect& bounds); |