mash: Move ash/common/wm/shelf to ash/common/shelf

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 d82177ec89e116a552e989e06cd1ac040d97ff03..26b65bb832022cc2558424d0bec5be081e3d3eeb 100644
--- a/ash/shelf/shelf_locking_manager.cc
+++ b/ash/shelf/shelf_locking_manager.cc
@@ -47,11 +47,11 @@ void ShelfLockingManager::OnLockStateEvent(EventType event) {
 }
 
 void ShelfLockingManager::UpdateLockedState() {
-  const wm::ShelfAlignment alignment = shelf_->alignment();
-  if (is_locked() && alignment != wm::SHELF_ALIGNMENT_BOTTOM_LOCKED) {
+  const ShelfAlignment alignment = shelf_->alignment();
+  if (is_locked() && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     stored_alignment_ = alignment;
-    shelf_->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED);
-  } else if (!is_locked() && alignment == wm::SHELF_ALIGNMENT_BOTTOM_LOCKED) {
+    shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED);
+  } else if (!is_locked() && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_->SetAlignment(stored_alignment_);
   }
 }