| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/sys_string_conversions.h" | 5 #include "base/sys_string_conversions.h" |
| 6 | 6 |
| 7 #include <wchar.h> | 7 #include <wchar.h> |
| 8 | 8 |
| 9 #include "base/string_piece.h" | 9 #include "base/string_piece.h" |
| 10 #include "base/string_util.h" | 10 #include "base/utf_string_conversions.h" |
| 11 | 11 |
| 12 namespace base { | 12 namespace base { |
| 13 | 13 |
| 14 std::string SysWideToUTF8(const std::wstring& wide) { | 14 std::string SysWideToUTF8(const std::wstring& wide) { |
| 15 // In theory this should be using the system-provided conversion rather | 15 // In theory this should be using the system-provided conversion rather |
| 16 // than our ICU, but this will do for now. | 16 // than our ICU, but this will do for now. |
| 17 return WideToUTF8(wide); | 17 return WideToUTF8(wide); |
| 18 } | 18 } |
| 19 std::wstring SysUTF8ToWide(const StringPiece& utf8) { | 19 std::wstring SysUTF8ToWide(const StringPiece& utf8) { |
| 20 // In theory this should be using the system-provided conversion rather | 20 // In theory this should be using the system-provided conversion rather |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 default: | 135 default: |
| 136 i += res; | 136 i += res; |
| 137 break; | 137 break; |
| 138 } | 138 } |
| 139 } | 139 } |
| 140 | 140 |
| 141 return out; | 141 return out; |
| 142 } | 142 } |
| 143 | 143 |
| 144 } // namespace base | 144 } // namespace base |
| OLD | NEW |