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

ash/system/status_area_widget.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_H_
 #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"
 
 namespace ash {
 class OverviewButtonTray;
 class ShelfWidget;
 class ShellDelegate;
 class StatusAreaWidgetDelegate;
 class SystemTray;
@@ skipping 12 matching lines @@
   ~StatusAreaWidget() override;
 
   // Creates the SystemTray, WebNotificationTray and LogoutButtonTray.
   void CreateTrayViews();
 
   // Destroys the system tray and web notification tray. Called before
   // tearing down the windows to avoid shutdown ordering issues.
   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);
 
   // Called by the client when the login status changes. Caches login_status
   // and calls UpdateAfterLoginStatusChange for the system tray and the web
   // notification tray.
   void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
 
   StatusAreaWidgetDelegate* status_area_widget_delegate() {
@@ skipping 48 matching lines @@
   user::LoginStatus login_status_;
 
   ShelfWidget* shelf_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_STATUS_AREA_WIDGET_H_