mash: Remove StatusAreaWidget references from system tray classes

ash/system/tray/system_tray.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_TRAY_SYSTEM_TRAY_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/system/tray/system_tray_bubble.h"
 #include "ash/common/system/tray/tray_background_view.h"
 #include "ash/system/cast/tray_cast.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 enum class LoginStatus;
 class ScreenTrayItem;
-class StatusAreaWidget;
 class SystemBubbleWrapper;
 class SystemTrayDelegate;
 class SystemTrayItem;
 class TrayAccessibility;
 class TrayDate;
 class TrayUpdate;
 class TrayUser;
+class WebNotificationTray;
+class WmShelf;
 
 // There are different methods for creating bubble views.
 enum BubbleCreationType {
   BUBBLE_CREATE_NEW,    // Closes any existing bubble and creates a new one.
   BUBBLE_USE_EXISTING,  // Uses any existing bubble, or creates a new one.
 };
 
 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);
 
   // Removes an existing tray item.
   void RemoveTrayItem(SystemTrayItem* item);
 
   // Returns all tray items that has been added to system tray.
   const std::vector<SystemTrayItem*>& GetTrayItems() const;
 
@@ skipping 148 matching lines @@
 
   // Records UMA metrics for the number of user-visible rows in the system menu
   // and the percentage of the work area height covered by the system menu.
   void RecordSystemMenuMetrics();
 
   const ScopedVector<SystemTrayItem>& items() const { return items_; }
 
   // 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_;
 
   // Pointers to members of |items_|.
   SystemTrayItem* detailed_item_;
   std::vector<SystemTrayItem*> notification_items_;
 
   // Mappings of system tray item and it's view in the tray.
   std::map<SystemTrayItem*, views::View*> tray_item_map_;
@@ skipping 25 matching lines @@
   // A reference to the Screen share and capture item.
   ScreenTrayItem* screen_capture_tray_item_;  // not owned
   ScreenTrayItem* screen_share_tray_item_;    // not owned
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_