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

ash/system/tray/tray_image_item.cc

Index: ash/system/tray/tray_image_item.cc
diff --git a/ash/system/tray/tray_image_item.cc b/ash/system/tray/tray_image_item.cc
index 4b42984767464efa7f7196b404c2baeec35eb044..b08a4360bbb25be5de566a8c00a9382d17fd21e1 100644
--- a/ash/system/tray/tray_image_item.cc
+++ b/ash/system/tray/tray_image_item.cc
@@ -4,7 +4,7 @@
 
 #include "ash/system/tray/tray_image_item.h"
 
-#include "ash/common/wm/shelf/wm_shelf_util.h"
+#include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_item_view.h"
@@ -58,8 +58,7 @@ views::View* TrayImageItem::CreateDetailedView(user::LoginStatus status) {
 void TrayImageItem::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
-void TrayImageItem::UpdateAfterShelfAlignmentChange(
-    wm::ShelfAlignment alignment) {
+void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   SetTrayImageItemBorder(tray_view_, alignment);
   SetItemAlignment(alignment);
 }
@@ -74,9 +73,9 @@ void TrayImageItem::DestroyDefaultView() {
 void TrayImageItem::DestroyDetailedView() {
 }
 
-void TrayImageItem::SetItemAlignment(wm::ShelfAlignment alignment) {
+void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) {
   // Center the item dependent on the orientation of the shelf.
-  views::BoxLayout::Orientation layout = wm::IsHorizontalAlignment(alignment)
+  views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment)
                                              ? views::BoxLayout::kHorizontal
                                              : views::BoxLayout::kVertical;
   tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));