Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 // non-zero, then the view is automatically closed after the specified time. | 67 // non-zero, then the view is automatically closed after the specified time. |
| 68 void ShowDetailedView(SystemTrayItem* item, | 68 void ShowDetailedView(SystemTrayItem* item, |
| 69 int close_delay_in_seconds, | 69 int close_delay_in_seconds, |
| 70 bool activate, | 70 bool activate, |
| 71 BubbleCreationType creation_type); | 71 BubbleCreationType creation_type); |
| 72 | 72 |
| 73 // Continue showing the existing detailed view, if any, for |close_delay| | 73 // Continue showing the existing detailed view, if any, for |close_delay| |
| 74 // seconds. | 74 // seconds. |
| 75 void SetDetailedViewCloseDelay(int close_delay); | 75 void SetDetailedViewCloseDelay(int close_delay); |
| 76 | 76 |
| 77 // Hides the detailed view for |item|. | 77 // Hides the detailed view for |item|. If |hide_animation| is false, disable |
| 78 void HideDetailedView(SystemTrayItem* item); | 78 // the hiding animation for hiding |item|. |
| 79 void HideDetailedView(SystemTrayItem* item, bool hide_animation); | |
|
Daniel Erat
2016/07/28 22:20:40
|hide_animation| is a confusing name, since it cou
Qiang(Joe) Xu
2016/07/28 23:15:57
Done.
| |
| 79 | 80 |
| 80 // Shows the notification view for |item|. | 81 // Shows the notification view for |item|. |
| 81 void ShowNotificationView(SystemTrayItem* item); | 82 void ShowNotificationView(SystemTrayItem* item); |
| 82 | 83 |
| 83 // Hides the notification view for |item|. | 84 // Hides the notification view for |item|. |
| 84 void HideNotificationView(SystemTrayItem* item); | 85 void HideNotificationView(SystemTrayItem* item); |
| 85 | 86 |
| 86 // Updates the items when the login status of the system changes. | 87 // Updates the items when the login status of the system changes. |
| 87 void UpdateAfterLoginStatusChange(LoginStatus login_status); | 88 void UpdateAfterLoginStatusChange(LoginStatus login_status); |
| 88 | 89 |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 255 // A reference to the Screen share and capture item. | 256 // A reference to the Screen share and capture item. |
| 256 ScreenTrayItem* screen_capture_tray_item_; // not owned | 257 ScreenTrayItem* screen_capture_tray_item_; // not owned |
| 257 ScreenTrayItem* screen_share_tray_item_; // not owned | 258 ScreenTrayItem* screen_share_tray_item_; // not owned |
| 258 | 259 |
| 259 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 260 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 260 }; | 261 }; |
| 261 | 262 |
| 262 } // namespace ash | 263 } // namespace ash |
| 263 | 264 |
| 264 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 265 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |