diff options
| author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 16:04:26 +0000 |
|---|---|---|
| committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-16 16:04:26 +0000 |
| commit | 7a80eebfcb0ab494b5ea2573e35bd5154981b252 (patch) | |
| tree | b457b9a1519ebf99b02fcbfb0add49ce75da4a27 | |
| parent | c0c37bef061d8ca81d639f87c7b285b960dca0fb (diff) | |
| download | chromium_src-7a80eebfcb0ab494b5ea2573e35bd5154981b252.zip chromium_src-7a80eebfcb0ab494b5ea2573e35bd5154981b252.tar.gz chromium_src-7a80eebfcb0ab494b5ea2573e35bd5154981b252.tar.bz2 | |
When disabling hiding top controls, clear any pending animations.
Cleanup for the CL:
https://codereview.chromium.org/12520009/
BUG=161303
Review URL: https://chromiumcodereview.appspot.com/12719009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188586 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | cc/top_controls_manager.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cc/top_controls_manager.cc b/cc/top_controls_manager.cc index 49d0c0c..3c9f960 100644 --- a/cc/top_controls_manager.cc +++ b/cc/top_controls_manager.cc @@ -58,9 +58,12 @@ TopControlsManager::~TopControlsManager() { void TopControlsManager::EnableHidingTopControls(bool enable) { enable_hiding_ = enable; - if (!enable && controls_top_offset_ != 0) { - SetupAnimation(SHOWING_CONTROLS); - client_->setNeedsRedraw(); + if (!enable) { + ResetAnimations(); + if (controls_top_offset_ != 0) { + SetupAnimation(SHOWING_CONTROLS); + client_->setNeedsRedraw(); + } } } |