mash: Break ash system tray dependencies on ash::ShelfWidget

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/common/login_status.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;
 class WebNotificationTray;
+class WmShelf;
 class WmWindow;
 #if defined(OS_CHROMEOS)
 class LogoutButtonTray;
 class VirtualKeyboardTray;
 #endif
 
 class ASH_EXPORT StatusAreaWidget : public views::Widget {
  public:
-  StatusAreaWidget(WmWindow* status_container, ShelfWidget* shelf_widget);
+  StatusAreaWidget(WmWindow* status_container, WmShelf* wm_shelf);
   ~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.
@@ skipping 10 matching lines @@
   StatusAreaWidgetDelegate* status_area_widget_delegate() {
     return status_area_widget_delegate_;
   }
   SystemTray* system_tray() { return system_tray_; }
   WebNotificationTray* web_notification_tray() {
     return web_notification_tray_;
   }
   OverviewButtonTray* overview_button_tray() {
     return overview_button_tray_;
   }
-  ShelfWidget* shelf_widget() { return shelf_widget_; }
+  WmShelf* wm_shelf() { return wm_shelf_; }
 
   LoginStatus login_status() const { return login_status_; }
 
   // Returns true if the shelf should be visible. This is used when the
   // shelf is configured to auto-hide and test if the shelf should force
   // the shelf to remain visible.
   bool ShouldShowShelf() const;
 
   // True if any message bubble is shown.
   bool IsMessageBubbleShown() const;
@@ skipping 20 matching lines @@
   StatusAreaWidgetDelegate* status_area_widget_delegate_;
   OverviewButtonTray* overview_button_tray_;
   SystemTray* system_tray_;
   WebNotificationTray* web_notification_tray_;
 #if defined(OS_CHROMEOS)
   LogoutButtonTray* logout_button_tray_;
   VirtualKeyboardTray* virtual_keyboard_tray_;
 #endif
   LoginStatus login_status_;
 
-  ShelfWidget* shelf_widget_;
+  WmShelf* wm_shelf_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_STATUS_AREA_WIDGET_H_