| 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 <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 | 127 |
| 128 private: | 128 private: |
| 129 friend class MobileActivatorTest; | 129 friend class MobileActivatorTest; |
| 130 friend class NetworkStateHandler; | 130 friend class NetworkStateHandler; |
| 131 friend class NetworkChangeNotifierChromeosUpdateTest; | 131 friend class NetworkChangeNotifierChromeosUpdateTest; |
| 132 | 132 |
| 133 // Updates |name_| from WiFi.HexSSID if provided, and validates |name_|. | 133 // Updates |name_| from WiFi.HexSSID if provided, and validates |name_|. |
| 134 // Returns true if |name_| changes. | 134 // Returns true if |name_| changes. |
| 135 bool UpdateName(const base::DictionaryValue& properties); | 135 bool UpdateName(const base::DictionaryValue& properties); |
| 136 | 136 |
| 137 void set_visible(bool visible) { visible_ = visible; } | |
| 138 | |
| 139 // Set to true if the network is a member of Manager.Services. | 137 // Set to true if the network is a member of Manager.Services. |
| 140 bool visible_; | 138 bool visible_; |
| 141 | 139 |
| 142 // Network Service properties. Avoid adding any additional properties here. | 140 // Network Service properties. Avoid adding any additional properties here. |
| 143 // Instead use NetworkConfigurationHandler::GetProperties() to asynchronously | 141 // Instead use NetworkConfigurationHandler::GetProperties() to asynchronously |
| 144 // request properties from Shill. | 142 // request properties from Shill. |
| 145 std::string security_; | 143 std::string security_; |
| 146 std::string eap_method_; // Needed for WiFi EAP networks | 144 std::string eap_method_; // Needed for WiFi EAP networks |
| 147 std::string device_path_; | 145 std::string device_path_; |
| 148 std::string guid_; | 146 std::string guid_; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler | 186 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler |
| 189 // provides proxy configuration. crbug.com/241775 | 187 // provides proxy configuration. crbug.com/241775 |
| 190 base::DictionaryValue proxy_config_; | 188 base::DictionaryValue proxy_config_; |
| 191 | 189 |
| 192 DISALLOW_COPY_AND_ASSIGN(NetworkState); | 190 DISALLOW_COPY_AND_ASSIGN(NetworkState); |
| 193 }; | 191 }; |
| 194 | 192 |
| 195 } // namespace chromeos | 193 } // namespace chromeos |
| 196 | 194 |
| 197 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ | 195 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ |
| OLD | NEW |