| 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 #include "chromeos/network/network_state.h" | 5 #include "chromeos/network/network_state.h" |
| 6 | 6 |
| 7 #include "base/i18n/icu_encoding_detection.h" | 7 #include "base/i18n/icu_encoding_detection.h" |
| 8 #include "base/i18n/icu_string_conversions.h" | 8 #include "base/i18n/icu_string_conversions.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 dictionary->SetStringWithoutPathExpansion(flimflam::kStateProperty, | 183 dictionary->SetStringWithoutPathExpansion(flimflam::kStateProperty, |
| 184 connection_state_); | 184 connection_state_); |
| 185 dictionary->SetBooleanWithoutPathExpansion(flimflam::kConnectableProperty, | 185 dictionary->SetBooleanWithoutPathExpansion(flimflam::kConnectableProperty, |
| 186 connectable_); | 186 connectable_); |
| 187 dictionary->SetBooleanWithoutPathExpansion( | 187 dictionary->SetBooleanWithoutPathExpansion( |
| 188 flimflam::kPassphraseRequiredProperty, passphrase_required_); | 188 flimflam::kPassphraseRequiredProperty, passphrase_required_); |
| 189 dictionary->SetStringWithoutPathExpansion(flimflam::kErrorProperty, | 189 dictionary->SetStringWithoutPathExpansion(flimflam::kErrorProperty, |
| 190 error_); | 190 error_); |
| 191 dictionary->SetStringWithoutPathExpansion(shill::kErrorDetailsProperty, | 191 dictionary->SetStringWithoutPathExpansion(shill::kErrorDetailsProperty, |
| 192 error_details_); | 192 error_details_); |
| 193 base::DictionaryValue* ipconfig_properties = new DictionaryValue; | 193 base::DictionaryValue* ipconfig_properties = new base::DictionaryValue; |
| 194 ipconfig_properties->SetStringWithoutPathExpansion(flimflam::kAddressProperty, | 194 ipconfig_properties->SetStringWithoutPathExpansion(flimflam::kAddressProperty, |
| 195 ip_address_); | 195 ip_address_); |
| 196 base::ListValue* name_servers = new ListValue; | 196 base::ListValue* name_servers = new base::ListValue; |
| 197 name_servers->AppendStrings(dns_servers_); | 197 name_servers->AppendStrings(dns_servers_); |
| 198 ipconfig_properties->SetWithoutPathExpansion(flimflam::kNameServersProperty, | 198 ipconfig_properties->SetWithoutPathExpansion(flimflam::kNameServersProperty, |
| 199 name_servers); | 199 name_servers); |
| 200 dictionary->SetWithoutPathExpansion(shill::kIPConfigProperty, | 200 dictionary->SetWithoutPathExpansion(shill::kIPConfigProperty, |
| 201 ipconfig_properties); | 201 ipconfig_properties); |
| 202 | 202 |
| 203 dictionary->SetStringWithoutPathExpansion(flimflam::kActivationStateProperty, | 203 dictionary->SetStringWithoutPathExpansion(flimflam::kActivationStateProperty, |
| 204 activation_state_); | 204 activation_state_); |
| 205 dictionary->SetStringWithoutPathExpansion(flimflam::kRoamingStateProperty, | 205 dictionary->SetStringWithoutPathExpansion(flimflam::kRoamingStateProperty, |
| 206 roaming_); | 206 roaming_); |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 connection_state == flimflam::kStateConfiguration || | 330 connection_state == flimflam::kStateConfiguration || |
| 331 connection_state == flimflam::kStateCarrier); | 331 connection_state == flimflam::kStateCarrier); |
| 332 } | 332 } |
| 333 | 333 |
| 334 // static | 334 // static |
| 335 std::string NetworkState::IPConfigProperty(const char* key) { | 335 std::string NetworkState::IPConfigProperty(const char* key) { |
| 336 return base::StringPrintf("%s.%s", shill::kIPConfigProperty, key); | 336 return base::StringPrintf("%s.%s", shill::kIPConfigProperty, key); |
| 337 } | 337 } |
| 338 | 338 |
| 339 } // namespace chromeos | 339 } // namespace chromeos |
| OLD | NEW |