Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(488)

Side by Side Diff: base/utf_string_conversions.cc

Issue 3076013: Move ASCIIToWide and ASCIIToUTF16 to utf_string_conversions.h. I've found it... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 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" 7 #include "base/string_piece.h"
8 #include "base/string_util.h"
8 #include "base/utf_string_conversion_utils.h" 9 #include "base/utf_string_conversion_utils.h"
9 10
10 using base::PrepareForUTF8Output; 11 using base::PrepareForUTF8Output;
11 using base::PrepareForUTF16Or32Output; 12 using base::PrepareForUTF16Or32Output;
12 using base::ReadUnicodeCharacter; 13 using base::ReadUnicodeCharacter;
13 using base::WriteUnicodeCharacter; 14 using base::WriteUnicodeCharacter;
14 15
15 namespace { 16 namespace {
16 17
17 // Generalized Unicode converter ----------------------------------------------- 18 // Generalized Unicode converter -----------------------------------------------
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 167
167 bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output) { 168 bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output) {
168 return WideToUTF8(src, src_len, output); 169 return WideToUTF8(src, src_len, output);
169 } 170 }
170 171
171 std::string UTF16ToUTF8(const string16& utf16) { 172 std::string UTF16ToUTF8(const string16& utf16) {
172 return WideToUTF8(utf16); 173 return WideToUTF8(utf16);
173 } 174 }
174 175
175 #endif 176 #endif
177
178 std::wstring ASCIIToWide(const char* ascii) {
179 DCHECK(IsStringASCII(ascii)) << ascii;
180 return std::wstring(ascii, &ascii[strlen(ascii)]);
181 }
182
183 std::wstring ASCIIToWide(const std::string& ascii) {
184 DCHECK(IsStringASCII(ascii)) << ascii;
185 return std::wstring(ascii.begin(), ascii.end());
186 }
187
188 string16 ASCIIToUTF16(const char* ascii) {
189 DCHECK(IsStringASCII(ascii)) << ascii;
190 return string16(ascii, &ascii[strlen(ascii)]);
191 }
192
193 string16 ASCIIToUTF16(const std::string& ascii) {
194 DCHECK(IsStringASCII(ascii)) << ascii;
195 return string16(ascii.begin(), ascii.end());
196 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698