| 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 CHROMEOS_NETWORK_NETWORK_STATE_H_ | 5 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_H_ |
| 6 #define CHROMEOS_NETWORK_NETWORK_STATE_H_ | 6 #define CHROMEOS_NETWORK_NETWORK_STATE_H_ |
| 7 | 7 |
| 8 #include "chromeos/network/managed_state.h" | 8 #include "chromeos/network/managed_state.h" |
| 9 | 9 |
| 10 namespace chromeos { | 10 namespace chromeos { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 bool IsConnectedState() const; | 37 bool IsConnectedState() const; |
| 38 bool IsConnectingState() const; | 38 bool IsConnectingState() const; |
| 39 | 39 |
| 40 // Helpers (used e.g. when a state is cached) | 40 // Helpers (used e.g. when a state is cached) |
| 41 static bool StateIsConnected(const std::string& state); | 41 static bool StateIsConnected(const std::string& state); |
| 42 static bool StateIsConnecting(const std::string& state); | 42 static bool StateIsConnecting(const std::string& state); |
| 43 | 43 |
| 44 private: | 44 private: |
| 45 friend class NetworkStateHandler; | 45 friend class NetworkStateHandler; |
| 46 friend class NetworkChangeNotifierChromeosUpdateTest; |
| 46 | 47 |
| 47 // Called by NetworkStateHandler when the ip config changes. | 48 // Called by NetworkStateHandler when the ip config changes. |
| 48 void set_ip_address(const std::string& ip_address) { | 49 void set_ip_address(const std::string& ip_address) { |
| 49 ip_address_ = ip_address; | 50 ip_address_ = ip_address; |
| 50 } | 51 } |
| 51 | 52 |
| 52 // Common Network Service properties | 53 // Common Network Service properties |
| 53 std::string security_; | 54 std::string security_; |
| 54 std::string device_path_; | 55 std::string device_path_; |
| 55 std::string ip_address_; | 56 std::string ip_address_; |
| 56 std::string state_; | 57 std::string state_; |
| 57 std::string error_; | 58 std::string error_; |
| 58 // Wireless properties | 59 // Wireless properties |
| 59 int signal_strength_; | 60 int signal_strength_; |
| 60 // Cellular properties | 61 // Cellular properties |
| 61 std::string technology_; | 62 std::string technology_; |
| 62 std::string activation_state_; | 63 std::string activation_state_; |
| 63 std::string roaming_; | 64 std::string roaming_; |
| 64 | 65 |
| 65 DISALLOW_COPY_AND_ASSIGN(NetworkState); | 66 DISALLOW_COPY_AND_ASSIGN(NetworkState); |
| 66 }; | 67 }; |
| 67 | 68 |
| 68 } // namespace chromeos | 69 } // namespace chromeos |
| 69 | 70 |
| 70 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ | 71 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ |
| OLD | NEW |