diff options
| author | merkulova <merkulova@chromium.org> | 2014-12-23 04:39:15 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-23 12:39:55 +0000 |
| commit | e2b59c4c229ec214150f522f4b3f6b02d9cefaee (patch) | |
| tree | e3105a1c1df5620869e39fafb437d388303b018b /ash | |
| parent | 4353cae33756fd2fa4fd5384c9945943280345c7 (diff) | |
| download | chromium_src-e2b59c4c229ec214150f522f4b3f6b02d9cefaee.zip chromium_src-e2b59c4c229ec214150f522f4b3f6b02d9cefaee.tar.gz chromium_src-e2b59c4c229ec214150f522f4b3f6b02d9cefaee.tar.bz2 | |
Special check on Supervised User creation flow added to prevent misleading shelf alignment.
BUG=405361
Review URL: https://codereview.chromium.org/783663003
Cr-Commit-Position: refs/heads/master@{#309555}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shelf/shelf_layout_manager.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 08831e2..77cab17 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -252,7 +252,8 @@ bool ShelfLayoutManager::SetAlignment(ShelfAlignment alignment) { return false; alignment_ = alignment; - if (state_.is_screen_locked || state_.is_adding_user_screen) { + if (Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked() || + state_.is_adding_user_screen) { // The shelf will itself move to the bottom while locked. If a request is // sent to move while being locked, we postpone the move until the lock // screen goes away. @@ -270,7 +271,8 @@ ShelfAlignment ShelfLayoutManager::GetAlignment() const { // bottom alignment. Note: We cannot use state_.is_screen_locked here since // that flag gets set later than the SessionStateDelegate reports a locked // screen which leads in - if (state_.is_screen_locked || state_.is_adding_user_screen) + if (Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked() || + state_.is_adding_user_screen) return SHELF_ALIGNMENT_BOTTOM; return alignment_; } |