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_SYSTEM_STATUS_AREA_WIDGET_H_ | 5 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_H_ |
| 6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_H_ | 6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/launcher/background_animator.h" | 9 #include "ash/launcher/background_animator.h" |
| 10 #include "ash/system/user/login_status.h" | 10 #include "ash/system/user/login_status.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 65 } | 65 } |
| 66 | 66 |
| 67 user::LoginStatus login_status() const { return login_status_; } | 67 user::LoginStatus login_status() const { return login_status_; } |
| 68 | 68 |
| 69 private: | 69 private: |
| 70 void AddSystemTray(SystemTray* system_tray, ShellDelegate* shell_delegate); | 70 void AddSystemTray(SystemTray* system_tray, ShellDelegate* shell_delegate); |
| 71 void AddWebNotificationTray(WebNotificationTray* web_notification_tray); | 71 void AddWebNotificationTray(WebNotificationTray* web_notification_tray); |
| 72 | 72 |
| 73 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; | 73 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; |
| 74 // Weak pointers to View classes that are parented to StatusAreaWidget: | 74 // Weak pointers to View classes that are parented to StatusAreaWidget: |
| 75 internal::StatusAreaWidgetDelegate* widget_delegate_; | 75 internal::StatusAreaWidgetDelegate* status_area_widget_delegate_; |
|
stevenjb
2012/08/06 23:33:53
Note: I discovered that this was shadowing Widget:
| |
| 76 SystemTray* system_tray_; | 76 SystemTray* system_tray_; |
| 77 WebNotificationTray* web_notification_tray_; | 77 WebNotificationTray* web_notification_tray_; |
| 78 user::LoginStatus login_status_; | 78 user::LoginStatus login_status_; |
| 79 | 79 |
| 80 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); | 80 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 } // namespace internal | 83 } // namespace internal |
| 84 } // namespace ash | 84 } // namespace ash |
| 85 | 85 |
| 86 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ | 86 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ |
| OLD | NEW |