| 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_CHROMEOS_NETWORK_TRAY_NETWORK_H | 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H |
| 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H | 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| 11 #include "ash/common/system/chromeos/network/network_observer.h" |
| 12 #include "ash/common/system/chromeos/network/network_portal_detector_observer.h" |
| 11 #include "ash/common/system/tray/system_tray_item.h" | 13 #include "ash/common/system/tray/system_tray_item.h" |
| 12 #include "ash/system/chromeos/network/network_observer.h" | |
| 13 #include "ash/system/chromeos/network/network_portal_detector_observer.h" | |
| 14 #include "ash/system/chromeos/network/tray_network_state_observer.h" | 14 #include "ash/system/chromeos/network/tray_network_state_observer.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 chromeos { | 18 namespace chromeos { |
| 19 class NetworkState; | 19 class NetworkState; |
| 20 } | 20 } |
| 21 | 21 |
| 22 namespace ash { | 22 namespace ash { |
| 23 namespace tray { | 23 namespace tray { |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 tray::NetworkDetailedView* detailed_; | 61 tray::NetworkDetailedView* detailed_; |
| 62 bool request_wifi_view_; | 62 bool request_wifi_view_; |
| 63 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; | 63 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; |
| 64 | 64 |
| 65 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); | 65 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); |
| 66 }; | 66 }; |
| 67 | 67 |
| 68 } // namespace ash | 68 } // namespace ash |
| 69 | 69 |
| 70 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H | 70 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H |
| OLD | NEW |