| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 | 6 |
| 7 #include "base/string_piece.h" | |
| 8 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "base/strings/string_piece.h" |
| 9 #include "base/strings/utf_string_conversion_utils.h" | 9 #include "base/strings/utf_string_conversion_utils.h" |
| 10 | 10 |
| 11 using base::PrepareForUTF8Output; | 11 using base::PrepareForUTF8Output; |
| 12 using base::PrepareForUTF16Or32Output; | 12 using base::PrepareForUTF16Or32Output; |
| 13 using base::ReadUnicodeCharacter; | 13 using base::ReadUnicodeCharacter; |
| 14 using base::WriteUnicodeCharacter; | 14 using base::WriteUnicodeCharacter; |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 // Generalized Unicode converter ----------------------------------------------- | 18 // Generalized Unicode converter ----------------------------------------------- |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 | 177 |
| 178 std::wstring ASCIIToWide(const base::StringPiece& ascii) { | 178 std::wstring ASCIIToWide(const base::StringPiece& ascii) { |
| 179 DCHECK(IsStringASCII(ascii)) << ascii; | 179 DCHECK(IsStringASCII(ascii)) << ascii; |
| 180 return std::wstring(ascii.begin(), ascii.end()); | 180 return std::wstring(ascii.begin(), ascii.end()); |
| 181 } | 181 } |
| 182 | 182 |
| 183 string16 ASCIIToUTF16(const base::StringPiece& ascii) { | 183 string16 ASCIIToUTF16(const base::StringPiece& ascii) { |
| 184 DCHECK(IsStringASCII(ascii)) << ascii; | 184 DCHECK(IsStringASCII(ascii)) << ascii; |
| 185 return string16(ascii.begin(), ascii.end()); | 185 return string16(ascii.begin(), ascii.end()); |
| 186 } | 186 } |
| OLD | NEW |