diff options
author | merkulova@chromium.org <merkulova@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 16:32:36 +0000 |
---|---|---|
committer | merkulova@chromium.org <merkulova@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 16:32:36 +0000 |
commit | 12749b00b4a775eac49ca62d378c09264f2029b5 (patch) | |
tree | 73aa6696bc0d7766adbe3dcf2a3dfccf99db3216 /ash | |
parent | ec2322e54319668369e5ae705db37e15391446a6 (diff) | |
download | chromium_src-12749b00b4a775eac49ca62d378c09264f2029b5.zip chromium_src-12749b00b4a775eac49ca62d378c09264f2029b5.tar.gz chromium_src-12749b00b4a775eac49ca62d378c09264f2029b5.tar.bz2 |
Sliding animation unified.
BUG=330746
Review URL: https://codereview.chromium.org/286623004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r-- | ash/shelf/shelf_layout_manager.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index db8c6ea..fce6b9e 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -1186,16 +1186,8 @@ void ShelfLayoutManager::OnDockBoundsChanging( void ShelfLayoutManager::OnLockStateEvent(LockStateObserver::EventType event) { if (event == EVENT_LOCK_ANIMATION_STARTED) { - // Enter the screen locked state as the animation starts to prevent - // layout changes as the screen locks. + // Enter the screen locked state. state_.is_screen_locked = true; - // Hide the status area widget (using auto hide animation). - base::AutoReset<ShelfVisibilityState> state(&state_.visibility_state, - SHELF_HIDDEN); - TargetBounds target_bounds; - CalculateTargetBounds(state_, &target_bounds); - UpdateBoundsAndOpacity(target_bounds, true, NULL); - UpdateVisibilityState(); } } |