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

ash/shelf/shelf.cc

Index: ash/shelf/shelf.cc
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index 0609d6dee1918386ce463f3fb1c08398aae81f46..faa1f4fdbca948384c1b4104f1b57cfd13db2762 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -70,6 +70,12 @@ void Shelf::SetAlignment(ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return;
 
+  if (shelf_locking_manager_.is_locked() &&
+      alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
+    shelf_locking_manager_.set_stored_alignment(alignment);
+    return;
+  }
+
   alignment_ = alignment;
   shelf_view_->OnShelfAlignmentChanged();
   shelf_widget_->OnShelfAlignmentChanged();