Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/shelf/shelf.cc

Index: ash/shelf/shelf.cc
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index faa1f4fdbca948384c1b4104f1b57cfd13db2762..e95f21d845902ec6d6568dba98b24a5841553401 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -21,6 +21,7 @@
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
+#include "ash/wm/aura/wm_shelf_aura.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ -49,6 +50,7 @@ Shelf::Shelf(ShelfModel* shelf_model,
   shelf_view_->Init();
   shelf_widget_->GetContentsView()->AddChildView(shelf_view_);
   shelf_widget_->GetNativeView()->SetName(kNativeViewName);
+  wm_shelf_.reset(new wm::WmShelfAura(this));

[James Cook, 2016/04/26 15:22:34]

optional: Maybe comment why this has to be done at the end? I presume it's
because the shelf layout manager is initialized as one of the steps above.

[sky, 2016/04/26 16:26:02]

Done.

 }
 
 Shelf::~Shelf() {
@@ -66,12 +68,12 @@ Shelf* Shelf::ForWindow(const aura::Window* window) {
   return shelf_widget ? shelf_widget->shelf() : nullptr;
 }
 
-void Shelf::SetAlignment(ShelfAlignment alignment) {
+void Shelf::SetAlignment(wm::ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return;
 
   if (shelf_locking_manager_.is_locked() &&
-      alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
+      alignment != wm::SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_locking_manager_.set_stored_alignment(alignment);
     return;
   }