Special check on Supervised User creation flow added to prevent misleading shelf alignment.

ash/shelf/shelf_layout_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <string>
@@ skipping 232 matching lines @@
   return shelf_->status_area_widget() &&
       shelf_->status_area_widget()->IsVisible() &&
       (state_.visibility_state == SHELF_VISIBLE ||
        (state_.visibility_state == SHELF_AUTO_HIDE &&
         state_.auto_hide_state == SHELF_AUTO_HIDE_SHOWN));
 }
 
 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 web ui screens (OOBE, lock,
user-adding), I believe the correct fix of the issue is to change
IsScreenLocked() to IsUserSessionBlocked() here and in
ShelfLayoutManager::GetAlignment(). As a bonus, you'll also fix the same problem
on user adding screen.
Current changes are not needed.

[merkulova, 2014/12/11 12:49:03]

They are necessary. As SU case is different: we don't cash state. Here  user
adding to multiprofile session is meant.

     // 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;
   }
 
   // This should not be called during the lock screen transitions.
   shelf_->SetAlignment(alignment);
   LayoutShelf();
   return true;
 }
 
@@ skipping 893 matching lines @@
 
 void ShelfLayoutManager::SessionStateChanged(
     SessionStateDelegate::SessionState state) {
   TargetBounds target_bounds;
   CalculateTargetBounds(state_, &target_bounds);
   UpdateBoundsAndOpacity(target_bounds, true, NULL);
   UpdateVisibilityState();
 }
 
 }  // namespace ash