mash: Remove StatusAreaWidget references from system tray classes

ash/common/system/web_notification/ash_popup_alignment_delegate.h

 // Copyright 2014 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_ASH_POPUP_ALIGNMENT_DELEGATE_H_
-#define ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
+#ifndef ASH_COMMON_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
+#define ASH_COMMON_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
 
 #include <stdint.h>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/shell_observer.h"
 #include "base/macros.h"
 #include "ui/display/display_observer.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 17 matching lines @@
       public WmShelfObserver,
       public ShellObserver,
       public display::DisplayObserver {
  public:
   explicit AshPopupAlignmentDelegate(WmShelf* shelf);
   ~AshPopupAlignmentDelegate() override;
 
   // Start observing the system.
   void StartObserving(display::Screen* screen, const display::Display& display);
 
-  // Sets the current height of the system tray so that the notification toasts
-  // can avoid it.
-  void SetSystemTrayHeight(int height);
+  // Sets the current height of the system tray bubble (or legacy notification
+  // bubble) so that web notification toasts can avoid it.
+  void SetTrayBubbleHeight(int height);
 
-  // Returns the current system tray height.
-  int system_tray_height_for_test() const { return system_tray_height_; }
+  // Returns the current tray bubble height or 0 if there is no bubble.
+  int tray_bubble_height_for_test() const { return tray_bubble_height_; }
 
   // Overridden from message_center::PopupAlignmentDelegate:
   int GetToastOriginX(const gfx::Rect& toast_bounds) const override;
   int GetBaseLine() const override;
   int GetWorkAreaBottom() const override;
   bool IsTopDown() const override;
   bool IsFromLeft() const override;
   void RecomputeAlignment(const display::Display& display) override;
   void ConfigureWidgetInitParamsForContainer(
       views::Widget* widget,
@@ skipping 21 matching lines @@
 
   // Overridden from display::DisplayObserver:
   void OnDisplayAdded(const display::Display& new_display) override;
   void OnDisplayRemoved(const display::Display& old_display) override;
   void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override;
 
   display::Screen* screen_;
   gfx::Rect work_area_;
   WmShelf* shelf_;
-  int system_tray_height_;
+  int tray_bubble_height_;
 
   DISALLOW_COPY_AND_ASSIGN(AshPopupAlignmentDelegate);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
+#endif  // ASH_COMMON_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_