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 9029cb16f70f1bdc8e728bd069cfb97fd7b382cf..6d08cebec4d38cdbad35fa905e98a9b83593320d 100644 |
--- a/ash/common/system/tray/system_tray.h |
+++ b/ash/common/system/tray/system_tray.h |
@@ -25,6 +25,7 @@ class SystemBubbleWrapper; |
class SystemTrayDelegate; |
class SystemTrayItem; |
class TrayAccessibility; |
+class TrayAudio; |
class TrayCast; |
class TrayDate; |
class TrayUpdate; |
@@ -74,8 +75,9 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, |
// seconds. |
void SetDetailedViewCloseDelay(int close_delay); |
- // Hides the detailed view for |item|. |
- void HideDetailedView(SystemTrayItem* item); |
+ // Hides the detailed view for |item|. If |animate| is false, disable |
+ // the hiding animation for hiding |item|. |
+ void HideDetailedView(SystemTrayItem* item, bool animate); |
// Shows the notification view for |item|. |
void ShowNotificationView(SystemTrayItem* item); |
@@ -121,6 +123,9 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, |
// otherwise. |
views::View* GetHelpButtonView() const; |
+ // Returns TrayAudio object if present or null otherwise. |
+ TrayAudio* GetTrayAudio() const; |
+ |
// Accessors for testing. |
// Returns true if the bubble exists. |
@@ -247,7 +252,9 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, |
// Note that the value is only valid when |system_bubble_| is true. |
bool full_system_tray_menu_; |
- TrayAccessibility* tray_accessibility_; // not owned |
+ // These objects are not owned by this class. |
+ TrayAccessibility* tray_accessibility_; |
+ TrayAudio* tray_audio_; // May be null. |
TrayCast* tray_cast_; |
TrayDate* tray_date_; |
TrayUpdate* tray_update_; |