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 35bf021510c1a509300d30777b2fb27669aab40b..c760a21bc8b1dd1cbd91aac7177c695c6b9652c9 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -7,8 +7,8 @@
 #include <algorithm>
 #include <cmath>
 
+#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"
@@ -85,12 +85,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;
   }
@@ -105,7 +105,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) {