diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-05 00:22:55 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-05 00:22:55 +0000 |
| commit | a0df03c127d9d6775e0d1cc7d45b41670952f9e3 (patch) | |
| tree | 7fd7d4fbc230e10f124ed389338da3ebf37b5198 /chrome/browser/instant/instant_controller.cc | |
| parent | a993a8699b62e149e3cc285d058228df1b7bf4e9 (diff) | |
| download | chromium_src-a0df03c127d9d6775e0d1cc7d45b41670952f9e3.zip chromium_src-a0df03c127d9d6775e0d1cc7d45b41670952f9e3.tar.gz chromium_src-a0df03c127d9d6775e0d1cc7d45b41670952f9e3.tar.bz2 | |
Fixes bug where instant fade would get stuck when pressing
alt-enter. In this case we would invoke HideInstant to remove the
fade, but at the time we did this instant was still enabled so that
Hide wouldn't completely remove everything.
BUG=67490
TEST=see bug
Review URL: http://codereview.chromium.org/6053009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant/instant_controller.cc')
| -rw-r--r-- | chrome/browser/instant/instant_controller.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index ed01fc5..fffe5db 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -224,7 +224,8 @@ void InstantController::DestroyPreviewContents() { } // ReleasePreviewContents sets is_active_ to false, but we need to set it - // beore notifying the delegate so. + // before notifying the delegate, otherwise if the delegate asks for the state + // we'll still be active. is_active_ = false; delegate_->HideInstant(); delete ReleasePreviewContents(INSTANT_COMMIT_DESTROY); |