diff options
| author | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-07 01:00:07 +0000 |
|---|---|---|
| committer | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-07 01:00:07 +0000 |
| commit | 494b1ef49c473b675e12c119bcaa3912b810ec86 (patch) | |
| tree | 0502205d25ffefd44f2c1a46212dc129cb31c825 /ash/shelf/background_animator.cc | |
| parent | 733ce08c0d3fe3c60e7acaee63c817bf5cddec46 (diff) | |
| download | chromium_src-494b1ef49c473b675e12c119bcaa3912b810ec86.zip chromium_src-494b1ef49c473b675e12c119bcaa3912b810ec86.tar.gz chromium_src-494b1ef49c473b675e12c119bcaa3912b810ec86.tar.bz2 | |
Animating docked background in sync with shelf
BUG=267582
TEST=Visual.
Dock a window.
Verify that docked background is same as the launcher background.
Open a second browser window.
Maximize it.
Verify that both docked background and the shelf background become opaque black.
Review URL: https://codereview.chromium.org/98373006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/background_animator.cc')
| -rw-r--r-- | ash/shelf/background_animator.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/shelf/background_animator.cc b/ash/shelf/background_animator.cc index 35e5fba..8137d60 100644 --- a/ash/shelf/background_animator.cc +++ b/ash/shelf/background_animator.cc @@ -34,11 +34,12 @@ void BackgroundAnimator::SetDuration(int time_in_ms) { animation_.SetSlideDuration(time_in_ms); } -void BackgroundAnimator::SetPaintsBackground(bool value, ChangeType type) { +void BackgroundAnimator::SetPaintsBackground( + bool value, BackgroundAnimatorChangeType type) { if (paints_background_ == value) return; paints_background_ = value; - if (type == CHANGE_IMMEDIATE && !animation_.is_animating()) { + if (type == BACKGROUND_CHANGE_IMMEDIATE && !animation_.is_animating()) { animation_.Reset(value ? 1.0f : 0.0f); AnimationProgressed(&animation_); return; |