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

ash/system/chromeos/network/tray_network.cc

Index: ash/system/chromeos/network/tray_network.cc
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index 2ec1112639cc65f0a2a7517a5a6564fc8b318638..a984d24b3ee34f91d0a562a11be3d9cc2043301a 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -5,7 +5,7 @@
 #include "ash/system/chromeos/network/tray_network.h"
 
 #include "ash/ash_switches.h"
-#include "ash/common/wm/shelf/wm_shelf_util.h"
+#include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
@@ -92,8 +92,8 @@ class NetworkTrayView : public TrayItemView,
     }
   }
 
-  void UpdateAlignment(wm::ShelfAlignment alignment) {
-    SetLayoutManager(new views::BoxLayout(wm::IsHorizontalAlignment(alignment)
+  void UpdateAlignment(ShelfAlignment alignment) {
+    SetLayoutManager(new views::BoxLayout(IsHorizontalAlignment(alignment)
                                               ? views::BoxLayout::kHorizontal
                                               : views::BoxLayout::kVertical,
                                           0, 0, 0));
@@ -304,8 +304,7 @@ void TrayNetwork::DestroyDetailedView() {
 void TrayNetwork::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
-void TrayNetwork::UpdateAfterShelfAlignmentChange(
-    wm::ShelfAlignment alignment) {
+void TrayNetwork::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   if (tray_) {
     SetTrayImageItemBorder(tray_, alignment);
     tray_->UpdateAlignment(alignment);