Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Unified Diff: ash/system/tray/system_tray.h

Issue 2103603002: mash: Remove StatusAreaWidget references from system tray classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments, rename SetSystemTrayHeight to SetTrayBubbleHeight Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/status_area_widget.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..da3b780df9f8a652ef3e284e99ebe6813ff3cdec 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,7 @@ class TrayAccessibility;
class TrayDate;
class TrayUpdate;
class TrayUser;
+class WebNotificationTray;
// There are different methods for creating bubble views.
enum BubbleCreationType {
@@ -40,12 +40,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 +218,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 view that appears adjacent to this view.
+ WebNotificationTray* web_notification_tray_;
// Owned items.
ScopedVector<SystemTrayItem> items_;
« no previous file with comments | « ash/system/status_area_widget.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698