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

ash/system/overview/overview_button_tray.cc

Index: ash/system/overview/overview_button_tray.cc
diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc
index c4155add8025431102b52d92e611645ab72e5c77..b226fcd9f8747eec52bf3a63a4493a9fec615656 100644
--- a/ash/system/overview/overview_button_tray.cc
+++ b/ash/system/overview/overview_button_tray.cc
@@ -4,9 +4,9 @@
 
 #include "ash/system/overview/overview_button_tray.h"
 
-#include "ash/common/wm/shelf/wm_shelf_util.h"
+#include "ash/common/shelf/shelf_types.h"
+#include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/session/session_state_delegate.h"
-#include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ -96,7 +96,7 @@ void OverviewButtonTray::HideBubbleWithView(
   // This class has no bubbles to hide.
 }
 
-void OverviewButtonTray::SetShelfAlignment(wm::ShelfAlignment alignment) {
+void OverviewButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
 
@@ -105,7 +105,7 @@ void OverviewButtonTray::SetShelfAlignment(wm::ShelfAlignment alignment) {
 }
 
 void OverviewButtonTray::SetIconBorderForShelfAlignment() {
-  if (wm::IsHorizontalAlignment(shelf_alignment())) {
+  if (IsHorizontalAlignment(shelf_alignment())) {
     icon_->SetBorder(views::Border::CreateEmptyBorder(
         kHorizontalShelfVerticalPadding,
         kHorizontalShelfHorizontalPadding,