| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 // Wifi property accessors | 80 // Wifi property accessors |
| 81 const std::string& eap_method() const { return eap_method_; } | 81 const std::string& eap_method() const { return eap_method_; } |
| 82 | 82 |
| 83 // Cellular property accessors | 83 // Cellular property accessors |
| 84 const std::string& network_technology() const { | 84 const std::string& network_technology() const { |
| 85 return network_technology_; | 85 return network_technology_; |
| 86 } | 86 } |
| 87 const std::string& activation_type() const { return activation_type_; } | 87 const std::string& activation_type() const { return activation_type_; } |
| 88 const std::string& activation_state() const { return activation_state_; } | 88 const std::string& activation_state() const { return activation_state_; } |
| 89 const std::string& roaming() const { return roaming_; } | 89 const std::string& roaming() const { return roaming_; } |
| 90 const std::string& payment_url() const { return payment_url_; } |
| 90 bool cellular_out_of_credits() const { return cellular_out_of_credits_; } | 91 bool cellular_out_of_credits() const { return cellular_out_of_credits_; } |
| 91 | 92 |
| 92 // Whether this network has a CACertNSS nickname set. | 93 // Whether this network has a CACertNSS nickname set. |
| 93 bool HasCACertNSS() const { return has_ca_cert_nss_; } | 94 bool HasCACertNSS() const { return has_ca_cert_nss_; } |
| 94 | 95 |
| 95 // Returns true if |connection_state_| is a connected/connecting state. | 96 // Returns true if |connection_state_| is a connected/connecting state. |
| 96 bool IsConnectedState() const; | 97 bool IsConnectedState() const; |
| 97 bool IsConnectingState() const; | 98 bool IsConnectingState() const; |
| 98 | 99 |
| 99 // Returns true if this is a network stored in a profile. | 100 // Returns true if this is a network stored in a profile. |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 GURL web_proxy_auto_discovery_url_; | 163 GURL web_proxy_auto_discovery_url_; |
| 163 | 164 |
| 164 // Wireless properties, used for icons and Connect logic. | 165 // Wireless properties, used for icons and Connect logic. |
| 165 int signal_strength_; | 166 int signal_strength_; |
| 166 | 167 |
| 167 // Cellular properties, used for icons, Connect, and Activation. | 168 // Cellular properties, used for icons, Connect, and Activation. |
| 168 std::string network_technology_; | 169 std::string network_technology_; |
| 169 std::string activation_type_; | 170 std::string activation_type_; |
| 170 std::string activation_state_; | 171 std::string activation_state_; |
| 171 std::string roaming_; | 172 std::string roaming_; |
| 173 std::string payment_url_; |
| 172 bool cellular_out_of_credits_; | 174 bool cellular_out_of_credits_; |
| 173 | 175 |
| 174 // Whether a deprecated CaCertNSS property of this network is set. Required | 176 // Whether a deprecated CaCertNSS property of this network is set. Required |
| 175 // for migration to PEM. | 177 // for migration to PEM. |
| 176 bool has_ca_cert_nss_; | 178 bool has_ca_cert_nss_; |
| 177 | 179 |
| 178 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler | 180 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler |
| 179 // provides proxy configuration. crbug.com/241775 | 181 // provides proxy configuration. crbug.com/241775 |
| 180 base::DictionaryValue proxy_config_; | 182 base::DictionaryValue proxy_config_; |
| 181 | 183 |
| 182 DISALLOW_COPY_AND_ASSIGN(NetworkState); | 184 DISALLOW_COPY_AND_ASSIGN(NetworkState); |
| 183 }; | 185 }; |
| 184 | 186 |
| 185 } // namespace chromeos | 187 } // namespace chromeos |
| 186 | 188 |
| 187 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ | 189 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ |
| OLD | NEW |