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 "webkit/glue/latin1_string_conversions.h" | 5 #include "base/strings/latin1_string_conversions.h" |
6 | 6 |
7 namespace webkit_glue { | 7 namespace base { |
8 | 8 |
9 string16 Latin1OrUTF16ToUTF16(size_t length, | 9 string16 Latin1OrUTF16ToUTF16(size_t length, |
10 const Latin1Char* latin1, | 10 const Latin1Char* latin1, |
11 const char16* utf16) { | 11 const char16* utf16) { |
12 if (!length) | 12 if (!length) |
13 return string16(); | 13 return string16(); |
14 if (latin1) | 14 if (latin1) |
15 return string16(latin1, latin1 + length); | 15 return string16(latin1, latin1 + length); |
16 return string16(utf16, utf16 + length); | 16 return string16(utf16, utf16 + length); |
17 } | 17 } |
18 | 18 |
19 } // namespace webkit_glue | 19 } // namespace base |
OLD | NEW |