| 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 20 matching lines...) Expand all Loading... |
| 31 virtual bool PropertyChanged(const std::string& key, | 31 virtual bool PropertyChanged(const std::string& key, |
| 32 const base::Value& value) OVERRIDE; | 32 const base::Value& value) OVERRIDE; |
| 33 virtual bool InitialPropertiesReceived( | 33 virtual bool InitialPropertiesReceived( |
| 34 const base::DictionaryValue& properties) OVERRIDE; | 34 const base::DictionaryValue& properties) OVERRIDE; |
| 35 | 35 |
| 36 // Fills |dictionary| with the state properties. All the properties that are | 36 // Fills |dictionary| with the state properties. All the properties that are |
| 37 // accepted by PropertyChanged are stored in |dictionary|, no other values are | 37 // accepted by PropertyChanged are stored in |dictionary|, no other values are |
| 38 // stored. | 38 // stored. |
| 39 void GetProperties(base::DictionaryValue* dictionary) const; | 39 void GetProperties(base::DictionaryValue* dictionary) const; |
| 40 | 40 |
| 41 // Returns true, if the network requires a service activation. |
| 42 bool RequiresActivation() const; |
| 43 |
| 41 // Accessors | 44 // Accessors |
| 42 const std::string& security() const { return security_; } | 45 const std::string& security() const { return security_; } |
| 43 const std::string& device_path() const { return device_path_; } | 46 const std::string& device_path() const { return device_path_; } |
| 44 const std::string& guid() const { return guid_; } | 47 const std::string& guid() const { return guid_; } |
| 45 const std::string& connection_state() const { return connection_state_; } | 48 const std::string& connection_state() const { return connection_state_; } |
| 46 const std::string& profile_path() const { return profile_path_; } | 49 const std::string& profile_path() const { return profile_path_; } |
| 47 const std::string& error() const { return error_; } | 50 const std::string& error() const { return error_; } |
| 48 bool connectable() const { return connectable_; } | 51 bool connectable() const { return connectable_; } |
| 49 | 52 |
| 50 const base::DictionaryValue& proxy_config() const { return proxy_config_; } | 53 const base::DictionaryValue& proxy_config() const { return proxy_config_; } |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 // Whether a deprecated CaCertNSS property of this network is set. Required | 153 // Whether a deprecated CaCertNSS property of this network is set. Required |
| 151 // for migration to PEM. | 154 // for migration to PEM. |
| 152 bool has_ca_cert_nss_; | 155 bool has_ca_cert_nss_; |
| 153 | 156 |
| 154 DISALLOW_COPY_AND_ASSIGN(NetworkState); | 157 DISALLOW_COPY_AND_ASSIGN(NetworkState); |
| 155 }; | 158 }; |
| 156 | 159 |
| 157 } // namespace chromeos | 160 } // namespace chromeos |
| 158 | 161 |
| 159 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ | 162 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ |
| OLD | NEW |