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

ash/system/chromeos/session/logout_button_tray.cc

Index: ash/system/chromeos/session/logout_button_tray.cc
diff --git a/ash/system/chromeos/session/logout_button_tray.cc b/ash/system/chromeos/session/logout_button_tray.cc
index 8830ba7934f67a93df01fc98f74cd81c3e24ffa8..7fc5ef630e81c243e932c8fa04b4cafd3b24d09a 100644
--- a/ash/system/chromeos/session/logout_button_tray.cc
+++ b/ash/system/chromeos/session/logout_button_tray.cc
@@ -7,7 +7,7 @@
 #include <memory>
 #include <utility>
 
-#include "ash/shelf/shelf_types.h"
+#include "ash/common/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/session/logout_confirmation_controller.h"
 #include "ash/system/status_area_widget.h"
@@ -109,7 +109,7 @@ LogoutButtonTray::~LogoutButtonTray() {
       RemoveLogoutButtonObserver(this);
 }
 
-void LogoutButtonTray::SetShelfAlignment(wm::ShelfAlignment alignment) {
+void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
   TrayBackgroundView::SetShelfAlignment(alignment);
   tray_container()->SetBorder(views::Border::NullBorder());
 }