mash: Remove StatusAreaWidget references from system tray classes

ash/system/tray/system_tray.h

Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 2b94af8fc5d9e4bbe6ddf794cb639b3613652a99..da55977ac77634800352db9ae171282d00476cc9 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -22,7 +22,6 @@ namespace ash {
 
 enum class LoginStatus;
 class ScreenTrayItem;
-class StatusAreaWidget;
 class SystemBubbleWrapper;
 class SystemTrayDelegate;
 class SystemTrayItem;
@@ -30,6 +29,8 @@ class TrayAccessibility;
 class TrayDate;
 class TrayUpdate;
 class TrayUser;
+class WebNotificationTray;
+class WmShelf;
 
 // There are different methods for creating bubble views.
 enum BubbleCreationType {
@@ -40,12 +41,16 @@ enum BubbleCreationType {
 class ASH_EXPORT SystemTray : public TrayBackgroundView,
                               public views::TrayBubbleView::Delegate {
  public:
-  explicit SystemTray(StatusAreaWidget* status_area_widget);
+  explicit SystemTray(WmShelf* wm_shelf);
   ~SystemTray() override;
 
   // Calls TrayBackgroundView::Initialize(), creates the tray items, and
   // adds them to SystemTrayNotifier.
-  void InitializeTrayItems(SystemTrayDelegate* delegate);
+  void InitializeTrayItems(SystemTrayDelegate* delegate,
+                           WebNotificationTray* web_notification_tray);
+
+  // Resets internal pointers.
+  void Shutdown();
 
   // Adds a new item in the tray.
   void AddTrayItem(SystemTrayItem* item);
@@ -214,8 +219,8 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
   // Overridden from ActionableView.
   bool PerformAction(const ui::Event& event) override;
 
-  // The widget containing this view.
-  StatusAreaWidget* status_area_widget_;
+  // The web notification tray for the display for this system tray.

[msw, 2016/06/27 23:57:36]

Does a system tray potentially have multiple displays? Maybe rephrase?

[James Cook, 2016/06/28 00:47:26]

Clarified that it's "the web notification tray view adjacent to this view".

+  WebNotificationTray* web_notification_tray_;
 
   // Owned items.
   ScopedVector<SystemTrayItem> items_;