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

ash/shelf/shelf_locking_manager.h

Index: ash/shelf/shelf_locking_manager.h
diff --git a/ash/shelf/shelf_locking_manager.h b/ash/shelf/shelf_locking_manager.h
index c96662f1658febf3325277d80d29f50cabde726d..81cb67e9690db01f3246e565aa40b8ee455834e6 100644
--- a/ash/shelf/shelf_locking_manager.h
+++ b/ash/shelf/shelf_locking_manager.h
@@ -6,8 +6,8 @@
 #define ASH_SHELF_SHELF_LOCKING_MANAGER_H_
 
 #include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_types.h"
 #include "ash/session/session_state_observer.h"
-#include "ash/shelf/shelf_types.h"
 #include "ash/shell_observer.h"
 #include "ash/wm/lock_state_observer.h"
 
@@ -24,9 +24,7 @@ class ASH_EXPORT ShelfLockingManager : public ShellObserver,
   ~ShelfLockingManager() override;
 
   bool is_locked() const { return session_locked_ || screen_locked_; }
-  void set_stored_alignment(wm::ShelfAlignment value) {
-    stored_alignment_ = value;
-  }
+  void set_stored_alignment(ShelfAlignment value) { stored_alignment_ = value; }
 
   // ShellObserver:
   void OnLockStateChanged(bool locked) override;
@@ -44,7 +42,7 @@ class ASH_EXPORT ShelfLockingManager : public ShellObserver,
   Shelf* shelf_;
   bool session_locked_ = false;
   bool screen_locked_ = false;
-  wm::ShelfAlignment stored_alignment_ = wm::SHELF_ALIGNMENT_BOTTOM;
+  ShelfAlignment stored_alignment_ = SHELF_ALIGNMENT_BOTTOM;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLockingManager);
 };