Refactors DockedWindowLayoutManager in terms of ash/wm/common

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 24be7d42e191efb0d7f1206b5c569ba32995061f..c96662f1658febf3325277d80d29f50cabde726d 100644
--- a/ash/shelf/shelf_locking_manager.h
+++ b/ash/shelf/shelf_locking_manager.h
@@ -24,7 +24,9 @@ class ASH_EXPORT ShelfLockingManager : public ShellObserver,
   ~ShelfLockingManager() override;
 
   bool is_locked() const { return session_locked_ || screen_locked_; }
-  void set_stored_alignment(ShelfAlignment value) { stored_alignment_ = value; }
+  void set_stored_alignment(wm::ShelfAlignment value) {
+    stored_alignment_ = value;
+  }
 
   // ShellObserver:
   void OnLockStateChanged(bool locked) override;
@@ -42,7 +44,7 @@ class ASH_EXPORT ShelfLockingManager : public ShellObserver,
   Shelf* shelf_;
   bool session_locked_ = false;
   bool screen_locked_ = false;
-  ShelfAlignment stored_alignment_ = SHELF_ALIGNMENT_BOTTOM;
+  wm::ShelfAlignment stored_alignment_ = wm::SHELF_ALIGNMENT_BOTTOM;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLockingManager);
 };