| 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_NETWORK_TRAY_NETWORK_H_ | 5 #ifndef ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_ |
| 6 #define ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_ | 6 #define ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| 11 #include "ash/system/network/network_observer.h" | 11 #include "ash/system/network/network_observer.h" |
| 12 #include "ash/system/network/network_portal_detector_observer.h" | 12 #include "ash/system/network/network_portal_detector_observer.h" |
| 13 #include "ash/system/network/tray_network_state_observer.h" | 13 #include "ash/system/network/tray_network_state_observer.h" |
| 14 #include "ash/system/tray/system_tray_item.h" | 14 #include "ash/system/tray/system_tray_item.h" |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 #include "base/time/time.h" | 16 #include "base/time/time.h" |
| 17 | 17 |
| 18 namespace ash { | 18 namespace ash { |
| 19 namespace tray { | 19 namespace tray { |
| 20 class NetworkDefaultView; | 20 class NetworkDefaultView; |
| 21 class NetworkDetailedView; | 21 class NetworkStateListDetailedView; |
| 22 class NetworkTrayView; | 22 class NetworkTrayView; |
| 23 } | 23 } |
| 24 | 24 |
| 25 class TrayNetwork : public SystemTrayItem, | 25 class TrayNetwork : public SystemTrayItem, |
| 26 public NetworkObserver, | 26 public NetworkObserver, |
| 27 public NetworkPortalDetectorObserver, | 27 public NetworkPortalDetectorObserver, |
| 28 public TrayNetworkStateObserver::Delegate { | 28 public TrayNetworkStateObserver::Delegate { |
| 29 public: | 29 public: |
| 30 explicit TrayNetwork(SystemTray* system_tray); | 30 explicit TrayNetwork(SystemTray* system_tray); |
| 31 ~TrayNetwork() override; | 31 ~TrayNetwork() override; |
| 32 | 32 |
| 33 tray::NetworkDetailedView* detailed() { return detailed_; } | 33 tray::NetworkStateListDetailedView* detailed() { return detailed_; } |
| 34 | 34 |
| 35 // SystemTrayItem | 35 // SystemTrayItem |
| 36 views::View* CreateTrayView(LoginStatus status) override; | 36 views::View* CreateTrayView(LoginStatus status) override; |
| 37 views::View* CreateDefaultView(LoginStatus status) override; | 37 views::View* CreateDefaultView(LoginStatus status) override; |
| 38 views::View* CreateDetailedView(LoginStatus status) override; | 38 views::View* CreateDetailedView(LoginStatus status) override; |
| 39 void DestroyTrayView() override; | 39 void DestroyTrayView() override; |
| 40 void DestroyDefaultView() override; | 40 void DestroyDefaultView() override; |
| 41 void DestroyDetailedView() override; | 41 void DestroyDetailedView() override; |
| 42 | 42 |
| 43 // NetworkObserver | 43 // NetworkObserver |
| 44 void RequestToggleWifi() override; | 44 void RequestToggleWifi() override; |
| 45 | 45 |
| 46 // NetworkPortalDetectorObserver | 46 // NetworkPortalDetectorObserver |
| 47 void OnCaptivePortalDetected(const std::string& guid) override; | 47 void OnCaptivePortalDetected(const std::string& guid) override; |
| 48 | 48 |
| 49 // TrayNetworkStateObserver::Delegate | 49 // TrayNetworkStateObserver::Delegate |
| 50 void NetworkStateChanged() override; | 50 void NetworkStateChanged() override; |
| 51 | 51 |
| 52 private: | 52 private: |
| 53 tray::NetworkTrayView* tray_; | 53 tray::NetworkTrayView* tray_; |
| 54 tray::NetworkDefaultView* default_; | 54 tray::NetworkDefaultView* default_; |
| 55 tray::NetworkDetailedView* detailed_; | 55 tray::NetworkStateListDetailedView* detailed_; |
| 56 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; | 56 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; |
| 57 | 57 |
| 58 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); | 58 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); |
| 59 }; | 59 }; |
| 60 | 60 |
| 61 } // namespace ash | 61 } // namespace ash |
| 62 | 62 |
| 63 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_ | 63 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_ |
| OLD | NEW |