Index: ash/common/system/tray/system_tray.h |
diff --git a/ash/common/system/tray/system_tray.h b/ash/common/system/tray/system_tray.h |
index 9ed13bc046cf6b55a0a2b63e261a8026f87e6d52..479ad77ead0e075d20ae98f4594afcb870c72350 100644 |
--- a/ash/common/system/tray/system_tray.h |
+++ b/ash/common/system/tray/system_tray.h |
@@ -83,21 +83,12 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, |
// the hiding animation for hiding |item|. |
void HideDetailedView(SystemTrayItem* item, bool animate); |
- // Shows the notification view for |item|. |
- void ShowNotificationView(SystemTrayItem* item); |
- |
- // Hides the notification view for |item|. |
- void HideNotificationView(SystemTrayItem* item); |
- |
// Updates the items when the login status of the system changes. |
void UpdateAfterLoginStatusChange(LoginStatus login_status); |
// Updates the items when the shelf alignment changes. |
void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment); |
- // Temporarily hides/unhides the notification bubble. |
- void SetHideNotifications(bool hidden); |
- |
// Returns true if the shelf should be forced visible when auto-hidden. |
bool ShouldShowShelf() const; |
@@ -105,20 +96,14 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, |
// of being created). |
bool HasSystemBubble() const; |
- // Returns true if there is a notification bubble. |
- bool HasNotificationBubble() const; |
- |
// Returns true if the system_bubble_ exists and is of type |type|. |
bool HasSystemBubbleType(SystemTrayBubble::BubbleType type); |
// Returns a pointer to the system bubble or NULL if none. |
SystemTrayBubble* GetSystemBubble(); |
- // Returns true if any bubble is visible. |
- bool IsAnyBubbleVisible() const; |
- |
- // Returns true if the mouse is inside the notification bubble. |
- bool IsMouseInNotificationBubble() const; |
+ // Returns true if SystemBubble is visible. |
tdanderson
2017/02/07 00:15:46
nit: "the system bubble" instead of the class name
yiyix
2017/02/07 22:03:22
Done.
|
+ bool IsSystemBubbleVisible() const; |
// Closes system bubble and returns true if it did exist. |
bool CloseSystemBubble() const; |
@@ -187,9 +172,6 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, |
// Resets |system_bubble_| and clears any related state. |
void DestroySystemBubble(); |
- // Resets |notification_bubble_| and clears any related state. |
- void DestroyNotificationBubble(); |
- |
// Returns a string with the current time for accessibility on the status |
// tray bar. |
base::string16 GetAccessibleTimeString(const base::Time& now) const; |
@@ -207,10 +189,6 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, |
BubbleCreationType creation_type, |
bool persistent); |
- // Constructs or re-constructs |notification_bubble_| and populates it with |
- // |notification_items_|, or destroys it if there are no notification items. |
- void UpdateNotificationBubble(); |
- |
// Checks the current status of the system tray and updates the web |
// notification tray according to the current status. |
void UpdateWebNotifications(); |
@@ -233,7 +211,6 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, |
// 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_; |
@@ -241,17 +218,10 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, |
// Bubble for default and detailed views. |
std::unique_ptr<SystemBubbleWrapper> system_bubble_; |
- // Bubble for notifications. |
- std::unique_ptr<SystemBubbleWrapper> notification_bubble_; |
- |
// Keep track of the default view height so that when we create detailed |
// views directly (e.g. from a notification) we know what height to use. |
int default_bubble_height_; |
- // Set to true when system notifications should be hidden (e.g. web |
- // notification bubble is visible). |
- bool hide_notifications_; |
- |
// This is true when the displayed system tray menu is a full tray menu, |
// otherwise a single line item menu like the volume slider is shown. |
// Note that the value is only valid when |system_bubble_| is true. |