mash: Remove StatusAreaWidget references from system tray classes

ash/common/system/web_notification/web_notification_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_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
-#define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
+#ifndef ASH_COMMON_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
+#define ASH_COMMON_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/login_status.h"
 #include "ash/common/system/tray/tray_background_view.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/base/models/simple_menu_model.h"
@@ skipping 16 matching lines @@
 }
 
 namespace message_center {
 class MessageBubbleBase;
 class MessageCenter;
 class MessageCenterBubble;
 class MessagePopupCollection;
 }
 
 namespace ash {
-class StatusAreaWidget;
+class AshPopupAlignmentDelegate;
+class SystemTray;
 class WebNotificationBubbleWrapper;
 class WebNotificationButton;
-class AshPopupAlignmentDelegate;
+class WmWindow;
 
 class ASH_EXPORT WebNotificationTray
     : public TrayBackgroundView,
       public views::TrayBubbleView::Delegate,
       public message_center::MessageCenterTrayDelegate,
       public views::ButtonListener,
       public base::SupportsWeakPtr<WebNotificationTray>,
       public ui::SimpleMenuModel::Delegate {
  public:
-  explicit WebNotificationTray(StatusAreaWidget* status_area_widget);
+  WebNotificationTray(WmShelf* shelf,
+                      WmWindow* status_area_window,
+                      SystemTray* system_tray);
   ~WebNotificationTray() override;
 
-  // Sets the height of the system tray from the edge of the work area so that
-  // the notification popups don't overlap with the tray. Passes 0 if no UI is
-  // shown in the system tray side.
-  void SetSystemTrayHeight(int height);
+  // Sets the height of the system tray bubble (or legacy notification bubble)
+  // from the edge of the work area so that the web notification popups don't
+  // overlap with the tray. Pass 0 if no bubble is shown.
+  void SetTrayBubbleHeight(int height);
 
-  // Returns the current system tray height.
-  int system_tray_height_for_test() const;
+  // Returns the current tray bubble height or 0 if there is no bubble.
+  int tray_bubble_height_for_test() const;
 
   // Returns true if it should block the auto hide behavior of the shelf.
   bool ShouldBlockShelfAutoHide() const;
 
   // Returns true if the message center bubble is visible.
   bool IsMessageCenterBubbleVisible() const;
 
   // Returns true if the mouse is inside the notification bubble.
   bool IsMouseInNotificationBubble() const;
 
@@ skipping 86 matching lines @@
   }
 
   // Returns true if any user is logged in and the system is not at the screen
   // for adding a secondary user.
   bool IsLoggedIn() const;
 
   // Testing accessors.
   bool IsPopupVisible() const;
   message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
 
-  StatusAreaWidget* status_area_widget_;
+  WmWindow* status_area_window_;
+  SystemTray* system_tray_;
   std::unique_ptr<message_center::MessageCenterTray> message_center_tray_;
   std::unique_ptr<WebNotificationBubbleWrapper> message_center_bubble_;
   std::unique_ptr<message_center::MessagePopupCollection> popup_collection_;
   WebNotificationButton* button_;
 
   bool show_message_center_on_unlock_;
 
   bool should_update_tray_content_;
 
   // True when the shelf auto hide behavior has to be blocked. Previously
   // this was done by checking |message_center_bubble_| but actually
   // the check can be called when creating this object, so it would cause
   // flickers of the shelf from hidden to shown. See: crbug.com/181213
   bool should_block_shelf_auto_hide_;
 
   std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
+#endif  // ASH_COMMON_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_