Revert of Revert of Special check on Supervised User creation flow added to prevent misleading ..

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 234 matching lines @@
       (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;
 
   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.
     return false;
   }
 
   // This should not be called during the lock screen transitions.
   shelf_->SetAlignment(alignment);
   LayoutShelf();
   return true;
 }
 
 ShelfAlignment ShelfLayoutManager::GetAlignment() const {
   // When the screen is locked or a user gets added, the shelf is forced into
   // 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_;
 }
 
 gfx::Rect ShelfLayoutManager::GetIdealBounds() {
   gfx::Rect bounds(
       ScreenUtil::GetDisplayBoundsInParent(shelf_->GetNativeView()));
   int width = 0, height = 0;
   GetShelfSize(&width, &height);
   return SelectValueForShelfAlignment(
@@ skipping 896 matching lines @@
 }
 
 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() {
   shelf_->SetAlignment(state_.is_adding_user_screen || state_.is_screen_locked ?
                            SHELF_ALIGNMENT_BOTTOM : alignment_);
   UpdateVisibilityState();
   LayoutShelf();
 }
 
 }  // namespace ash