Index: ash/shelf/shelf_layout_manager.cc |
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc |
index d89ffb22ce78178bb9a30a3f6e0ad4d961969b40..c4077d0e15e7805caddb4c478497976503842b19 100644 |
--- a/ash/shelf/shelf_layout_manager.cc |
+++ b/ash/shelf/shelf_layout_manager.cc |
@@ -764,9 +764,8 @@ void ShelfLayoutManager::UpdateBoundsAndOpacity( |
shelf_widget_->status_area_widget()->GetNativeView()->parent(), |
status_bounds)); |
} |
- // For crbug.com/622431, when the shelf alignment is BOTTOM_LOCKED, we |
- // don't set display work area, as it is not real user-set alignment. |
if (!state_.is_screen_locked && |
+ !WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked() && |
shelf_widget_->GetAlignment() != SHELF_ALIGNMENT_BOTTOM_LOCKED) { |
gfx::Insets insets; |
// If user session is blocked (login to new user session or add user to |