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

ash/shelf/shelf.cc

Index: ash/shelf/shelf.cc
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index 5c8b927ac27248b4c38eaa6e15cbb5c33eb13e2c..63bd2a9ac0a1c6fc8e695c3b5502b27d4a18f4dd 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -8,8 +8,8 @@
 #include <cmath>
 
 #include "ash/aura/wm_shelf_aura.h"
+#include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
-#include "ash/common/wm/shelf/wm_shelf_util.h"
 #include "ash/focus_cycler.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
@@ -53,7 +53,7 @@ Shelf::Shelf(ShelfModel* shelf_model,
   shelf_widget_->GetNativeView()->SetName(kNativeViewName);
   // This has to be done after the ShelfWidget and ShelfLayoutManager have
   // been created.
-  wm_shelf_.reset(new wm::WmShelfAura(this));
+  wm_shelf_.reset(new WmShelfAura(this));
 }
 
 Shelf::~Shelf() {
@@ -84,12 +84,12 @@ Shelf* Shelf::ForDisplayId(int64_t display_id) {
   return nullptr;
 }
 
-void Shelf::SetAlignment(wm::ShelfAlignment alignment) {
+void Shelf::SetAlignment(ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return;
 
   if (shelf_locking_manager_.is_locked() &&
-      alignment != wm::SHELF_ALIGNMENT_BOTTOM_LOCKED) {
+      alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_locking_manager_.set_stored_alignment(alignment);
     return;
   }
@@ -104,7 +104,7 @@ void Shelf::SetAlignment(wm::ShelfAlignment alignment) {
 }
 
 bool Shelf::IsHorizontalAlignment() const {
-  return wm::IsHorizontalAlignment(alignment_);
+  return ::ash::IsHorizontalAlignment(alignment_);
 }
 
 void Shelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {