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

ash/system/tray/tray_utils.h

Index: ash/system/tray/tray_utils.h
diff --git a/ash/system/tray/tray_utils.h b/ash/system/tray/tray_utils.h
index 0b36cb05e37154ea97e18786a32f33f47d897b3f..9b4f2a6ee18cd6d3368d2411707ab5085a51a6b3 100644
--- a/ash/system/tray/tray_utils.h
+++ b/ash/system/tray/tray_utils.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "ash/shelf/shelf_types.h"
+#include "ash/common/shelf/shelf_types.h"
 #include "base/strings/string16.h"
 
 namespace views {
@@ -25,12 +25,10 @@ void SetupLabelForTray(views::Label* label);
 // TODO(jennyz): refactor these two functions to SystemTrayItem.
 // Sets the empty border of an image tray item for adjusting the space
 // around it.
-void SetTrayImageItemBorder(views::View* tray_view,
-                            wm::ShelfAlignment alignment);
+void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment);
 // Sets the empty border around a label tray item for adjusting the space
 // around it.
-void SetTrayLabelItemBorder(TrayItemView* tray_view,
-                            wm::ShelfAlignment alignment);
+void SetTrayLabelItemBorder(TrayItemView* tray_view, ShelfAlignment alignment);
 
 // Computes an accessible label for this button based on all descendant view
 // labels by concatenating them in depth-first order.