| 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 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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::NetworkDetailedView* detailed_; |
| 56 bool request_wifi_view_; | |
| 57 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; | 56 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; |
| 58 | 57 |
| 59 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); | 58 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); |
| 60 }; | 59 }; |
| 61 | 60 |
| 62 } // namespace ash | 61 } // namespace ash |
| 63 | 62 |
| 64 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_ | 63 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2817423002:
ash: Move "WiFi is turned on." buble to the notification center. (Closed)
