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 #include "ui/message_center/message_center.h" | |
fukino
2017/04/17 08:43:40
These look unnecessary.
tetsui2
2017/04/18 01:11:33
Done.
| |
18 #include "ui/message_center/notification.h" | |
17 | 19 |
18 namespace ash { | 20 namespace ash { |
19 namespace tray { | 21 namespace tray { |
20 class NetworkDefaultView; | 22 class NetworkDefaultView; |
21 class NetworkDetailedView; | |
22 class NetworkTrayView; | 23 class NetworkTrayView; |
23 } | 24 } |
24 | 25 |
25 class TrayNetwork : public SystemTrayItem, | 26 class TrayNetwork : public SystemTrayItem, |
26 public NetworkObserver, | 27 public NetworkObserver, |
27 public NetworkPortalDetectorObserver, | 28 public NetworkPortalDetectorObserver, |
28 public TrayNetworkStateObserver::Delegate { | 29 public TrayNetworkStateObserver::Delegate { |
29 public: | 30 public: |
30 explicit TrayNetwork(SystemTray* system_tray); | 31 explicit TrayNetwork(SystemTray* system_tray); |
31 ~TrayNetwork() override; | 32 ~TrayNetwork() override; |
32 | 33 |
33 tray::NetworkDetailedView* detailed() { return detailed_; } | |
34 | |
35 // SystemTrayItem | 34 // SystemTrayItem |
36 views::View* CreateTrayView(LoginStatus status) override; | 35 views::View* CreateTrayView(LoginStatus status) override; |
37 views::View* CreateDefaultView(LoginStatus status) override; | 36 views::View* CreateDefaultView(LoginStatus status) override; |
38 views::View* CreateDetailedView(LoginStatus status) override; | |
39 void DestroyTrayView() override; | 37 void DestroyTrayView() override; |
40 void DestroyDefaultView() override; | 38 void DestroyDefaultView() override; |
41 void DestroyDetailedView() override; | |
42 | 39 |
43 // NetworkObserver | 40 // NetworkObserver |
44 void RequestToggleWifi() override; | 41 void RequestToggleWifi() override; |
45 | 42 |
46 // NetworkPortalDetectorObserver | 43 // NetworkPortalDetectorObserver |
47 void OnCaptivePortalDetected(const std::string& guid) override; | 44 void OnCaptivePortalDetected(const std::string& guid) override; |
48 | 45 |
49 // TrayNetworkStateObserver::Delegate | 46 // TrayNetworkStateObserver::Delegate |
50 void NetworkStateChanged() override; | 47 void NetworkStateChanged() override; |
51 | 48 |
52 private: | 49 private: |
53 tray::NetworkTrayView* tray_; | 50 tray::NetworkTrayView* tray_; |
54 tray::NetworkDefaultView* default_; | 51 tray::NetworkDefaultView* default_; |
55 tray::NetworkDetailedView* detailed_; | |
56 bool request_wifi_view_; | |
57 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; | 52 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; |
58 | 53 |
59 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); | 54 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); |
60 }; | 55 }; |
61 | 56 |
62 } // namespace ash | 57 } // namespace ash |
63 | 58 |
64 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_ | 59 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_ |
OLD | NEW |