Fix Chrome OS shelf locking for chromebook lid open/close.

ash/shelf/shelf_locking_manager.cc

Index: ash/shelf/shelf_locking_manager.cc
diff --git a/ash/shelf/shelf_locking_manager.cc b/ash/shelf/shelf_locking_manager.cc
index d291da6dc270092eceab4b2af6524a0f66f4ddf7..70035cdbbb29aad57b22628dc3cd27dcea41a94b 100644
--- a/ash/shelf/shelf_locking_manager.cc
+++ b/ash/shelf/shelf_locking_manager.cc
@@ -49,12 +49,11 @@ void ShelfLockingManager::OnLockStateEvent(EventType event) {
 }
 
 void ShelfLockingManager::UpdateLockedState() {
-  const bool should_be_locked = screen_locked_ || session_locked_;
   const ShelfAlignment alignment = shelf_->alignment();
-  if (should_be_locked && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
+  if (is_locked() && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     stored_alignment_ = alignment;
     shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED);
-  } else if (!should_be_locked && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) {
+  } else if (!is_locked() && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_->SetAlignment(stored_alignment_);
   }
 }