| Index: ash/system/chromeos/network/tray_network.h
|
| diff --git a/ash/system/chromeos/network/tray_network.h b/ash/system/chromeos/network/tray_network.h
|
| index 271c87cd76a0cd7786bb6581ee2b7e3ec6fb66e0..ae7f27f935509bb5129c4f19e6296670afa6809f 100644
|
| --- a/ash/system/chromeos/network/tray_network.h
|
| +++ b/ash/system/chromeos/network/tray_network.h
|
| @@ -12,6 +12,8 @@
|
| namespace ash {
|
| namespace internal {
|
|
|
| +class TrayNetworkStateObserver;
|
| +
|
| namespace tray {
|
| class NetworkDefaultView;
|
| class NetworkDetailedView;
|
| @@ -24,14 +26,12 @@ class NetworkTrayView;
|
| class TrayNetwork : public SystemTrayItem,
|
| public NetworkObserver {
|
| public:
|
| - enum DetailedViewType {
|
| - LIST_VIEW,
|
| - WIFI_VIEW,
|
| - };
|
| -
|
| TrayNetwork();
|
| virtual ~TrayNetwork();
|
|
|
| + tray::NetworkDetailedView* detailed() { return detailed_; }
|
| + void set_request_wifi_view(bool b) { request_wifi_view_ = b; }
|
| +
|
| // Overridden from SystemTrayItem.
|
| virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
|
| virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
|
| @@ -70,6 +70,7 @@ class TrayNetwork : public SystemTrayItem,
|
| tray::NetworkNotificationView* notification_;
|
| scoped_ptr<tray::NetworkMessages> messages_;
|
| bool request_wifi_view_;
|
| + scoped_ptr<TrayNetworkStateObserver> network_state_observer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
|
| };
|
|
|