Index: ash/system/status_area_widget.h |
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h |
index 1a99a0f328978735734a87139bf65aa4d3a7e776..cc0e6660d3e6ae8aae8079fa7b6b28d7331dd217 100644 |
--- a/ash/system/status_area_widget.h |
+++ b/ash/system/status_area_widget.h |
@@ -11,20 +11,41 @@ |
#include "ui/views/widget/widget.h" |
namespace ash { |
+ |
+class ShellDelegate; |
+class SystemTray; |
+class SystemTrayDelegate; |
+ |
namespace internal { |
class StatusAreaWidgetDelegate; |
class ASH_EXPORT StatusAreaWidget : public views::Widget { |
- public: |
+public: |
sadrul
2012/06/12 15:13:39
+space
stevenjb
2012/06/12 16:46:50
Done.
|
StatusAreaWidget(); |
virtual ~StatusAreaWidget(); |
- void AddTray(views::View* tray); |
+ // Creates the SystemTray. |
+ void CreateTrayViews(ShellDelegate* shell_delegate); |
+ |
+ // Destroys the system tray. Called before tearing down the windows to avoid |
+ // shutdown ordering issues. |
+ void Shutdown(); |
+ |
void SetShelfAlignment(ShelfAlignment alignment); |
+ SystemTray* system_tray() { return system_tray_; } |
+ SystemTrayDelegate* system_tray_delegate() { |
+ return system_tray_delegate_.get(); |
+ } |
+ |
private: |
+ void AddSystemTray(SystemTray* system_tray, ShellDelegate* shell_delegate); |
+ |
+ scoped_ptr<SystemTrayDelegate> system_tray_delegate_; |
+ // Child views owned by the view hierarchy: |
sadrul
2012/06/12 15:13:39
This comment is probably misplaced? (or needs some
stevenjb
2012/06/12 16:46:50
Clarified, hopefully :)
|
internal::StatusAreaWidgetDelegate* widget_delegate_; |
+ SystemTray* system_tray_; |
DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); |
}; |