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

ash/system/status_area_widget.h

Index: ash/system/status_area_widget.h
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h
index 6b00f202fa8d861953e45128e11083fe1e9710b9..7a06fdc220599733a1a15ac11b9823ad30b735ec 100644
--- a/ash/system/status_area_widget.h
+++ b/ash/system/status_area_widget.h
@@ -6,7 +6,7 @@
 #define ASH_SYSTEM_STATUS_AREA_WIDGET_H_
 
 #include "ash/ash_export.h"
-#include "ash/shelf/shelf_types.h"
+#include "ash/common/shelf/shelf_types.h"
 #include "ash/system/user/login_status.h"
 #include "base/macros.h"
 #include "ui/views/widget/widget.h"
@@ -39,7 +39,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
   void Shutdown();
 
   // Update the alignment of the widget and tray views.
-  void SetShelfAlignment(wm::ShelfAlignment alignment);
+  void SetShelfAlignment(ShelfAlignment alignment);
 
   // Set the visibility of system notifications.
   void SetHideSystemNotifications(bool hide);