| 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 "base/json/json_parser.h" | 5 #include "base/json/json_parser.h" |
| 6 | 6 |
| 7 #include "base/float_util.h" | 7 #include "base/float_util.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/string_number_conversions.h" | |
| 11 #include "base/string_piece.h" | 10 #include "base/string_piece.h" |
| 12 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 13 #include "base/stringprintf.h" | 12 #include "base/stringprintf.h" |
| 13 #include "base/strings/string_number_conversions.h" |
| 14 #include "base/third_party/icu/icu_utf.h" | 14 #include "base/third_party/icu/icu_utf.h" |
| 15 #include "base/utf_string_conversion_utils.h" | 15 #include "base/utf_string_conversion_utils.h" |
| 16 #include "base/utf_string_conversions.h" | 16 #include "base/utf_string_conversions.h" |
| 17 #include "base/values.h" | 17 #include "base/values.h" |
| 18 | 18 |
| 19 namespace base { | 19 namespace base { |
| 20 namespace internal { | 20 namespace internal { |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| (...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 955 const std::string& description) { | 955 const std::string& description) { |
| 956 if (line || column) { | 956 if (line || column) { |
| 957 return StringPrintf("Line: %i, column: %i, %s", | 957 return StringPrintf("Line: %i, column: %i, %s", |
| 958 line, column, description.c_str()); | 958 line, column, description.c_str()); |
| 959 } | 959 } |
| 960 return description; | 960 return description; |
| 961 } | 961 } |
| 962 | 962 |
| 963 } // namespace internal | 963 } // namespace internal |
| 964 } // namespace base | 964 } // namespace base |
| OLD | NEW |