Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2385)

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 783663003: Special check on Supervised User creation flow added to prevent misleading shelf alignment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/session/session_state_delegate.h ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index 340ab77411a50536073985d1733081459b2f1d2b..2e1f011a2e2dca8e41d305060de58ffa95a68142 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -250,11 +250,17 @@ bool ShelfLayoutManager::IsVisible() const {
bool ShelfLayoutManager::SetAlignment(ShelfAlignment alignment) {
if (alignment_ == alignment)
return false;
+ // On Supervised User creation we may get SetAlignment signal from authorised
+ // manager. We should ignore it.
+ if (Shell::GetInstance()->session_state_delegate()->
+ IsInSupervisedUserCreationFlow()) {
+ return false;
+ }
alignment_ = alignment;
if (Shell::GetInstance()->session_state_delegate()->IsScreenLocked()) {
dzhioev (left Google) 2014/12/08 15:51:49 Since we don't support vertical alignment on all w
merkulova 2014/12/11 12:49:03 They are necessary. As SU case is different: we do
// The shelf will itself move to the bottom while locked. If a request is
- // sent to move while being locked, we postpone the move untill the lock
+ // sent to move while being locked, we postpone the move until the lock
// screen goes away.
return false;
}
« no previous file with comments | « ash/session/session_state_delegate.h ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698