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/string_util.h" | |
10 #include "base/stringprintf.h" | |
11 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/strings/string_util.h" |
| 11 #include "base/strings/stringprintf.h" |
12 #include "base/strings/utf_string_conversion_utils.h" | 12 #include "base/strings/utf_string_conversion_utils.h" |
13 #include "chromeos/network/network_event_log.h" | 13 #include "chromeos/network/network_event_log.h" |
14 #include "chromeos/network/network_ui_data.h" | 14 #include "chromeos/network/network_ui_data.h" |
15 #include "chromeos/network/onc/onc_utils.h" | 15 #include "chromeos/network/onc/onc_utils.h" |
16 #include "third_party/cros_system_api/dbus/service_constants.h" | 16 #include "third_party/cros_system_api/dbus/service_constants.h" |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 bool ConvertListValueToStringVector(const base::ListValue& string_list, | 20 bool ConvertListValueToStringVector(const base::ListValue& string_list, |
21 std::vector<std::string>* result) { | 21 std::vector<std::string>* result) { |
(...skipping 308 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 |