OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/shill_property_util.h" | 5 #include "chromeos/network/shill_property_util.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/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
11 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
13 #include "base/strings/utf_string_conversion_utils.h" | 13 #include "base/strings/utf_string_conversion_utils.h" |
14 #include "base/values.h" | 14 #include "base/values.h" |
15 #include "chromeos/device_event_log.h" | |
16 #include "chromeos/network/network_ui_data.h" | 15 #include "chromeos/network/network_ui_data.h" |
17 #include "chromeos/network/onc/onc_utils.h" | 16 #include "chromeos/network/onc/onc_utils.h" |
| 17 #include "components/device_event_log/device_event_log.h" |
18 #include "third_party/cros_system_api/dbus/service_constants.h" | 18 #include "third_party/cros_system_api/dbus/service_constants.h" |
19 | 19 |
20 namespace chromeos { | 20 namespace chromeos { |
21 | 21 |
22 namespace shill_property_util { | 22 namespace shill_property_util { |
23 | 23 |
24 namespace { | 24 namespace { |
25 | 25 |
26 // Replace non UTF8 characters in |str| with a replacement character. | 26 // Replace non UTF8 characters in |str| with a replacement character. |
27 std::string ValidateUTF8(const std::string& str) { | 27 std::string ValidateUTF8(const std::string& str) { |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 LOG(WARNING) | 353 LOG(WARNING) |
354 << "Provider name and country not defined, using code instead: " | 354 << "Provider name and country not defined, using code instead: " |
355 << *home_provider_id; | 355 << *home_provider_id; |
356 } | 356 } |
357 return true; | 357 return true; |
358 } | 358 } |
359 | 359 |
360 } // namespace shill_property_util | 360 } // namespace shill_property_util |
361 | 361 |
362 } // namespace chromeos | 362 } // namespace chromeos |
OLD | NEW |