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; |
} |