Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/shelf/shelf_layout_manager.h

Index: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index a08531e5c4be809629072ac5ad735fde9c7cbb3a..1de5f5672e7c9e85568d5d6265c4f762ae228f38 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -180,22 +180,22 @@ class ASH_EXPORT ShelfLayoutManager
   }
 
   // TODO(msw): Remove these accessors, kept temporarily to simplify changes.
-  void SetAlignment(ShelfAlignment alignment) {
+  void SetAlignment(wm::ShelfAlignment alignment) {
     shelf_->shelf()->SetAlignment(alignment);
   }
-  ShelfAlignment GetAlignment() const { return shelf_->GetAlignment(); }
+  wm::ShelfAlignment GetAlignment() const { return shelf_->GetAlignment(); }
 
   // TODO(harrym|oshima): These templates will be moved to a new Shelf class.
   // A helper function for choosing values specific to a shelf alignment.
   template <typename T>
   T SelectValueForShelfAlignment(T bottom, T left, T right) const {
     switch (GetAlignment()) {
-      case SHELF_ALIGNMENT_BOTTOM:
-      case SHELF_ALIGNMENT_BOTTOM_LOCKED:
+      case wm::SHELF_ALIGNMENT_BOTTOM:
+      case wm::SHELF_ALIGNMENT_BOTTOM_LOCKED:
         return bottom;
-      case SHELF_ALIGNMENT_LEFT:
+      case wm::SHELF_ALIGNMENT_LEFT:
         return left;
-      case SHELF_ALIGNMENT_RIGHT:
+      case wm::SHELF_ALIGNMENT_RIGHT:
         return right;
     }
     NOTREACHED();
@@ -289,7 +289,7 @@ class ASH_EXPORT ShelfLayoutManager
   void UpdateShelfBackground(BackgroundAnimatorChangeType type);
 
   // Returns how the shelf background is painted.
-  ShelfBackgroundType GetShelfBackgroundType() const;
+  wm::ShelfBackgroundType GetShelfBackgroundType() const;
 
   // Updates the auto hide state immediately.
   void UpdateAutoHideStateNow();