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

Unified Diff: base/strings/utf_string_conversions.cc

Issue 1125773004: Pull in ASCII<->UTF16 from Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/mini_chromium@master
Patch Set: Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« base/strings/string_util.cc ('K') | « base/strings/utf_string_conversions.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/strings/utf_string_conversions.cc
diff --git a/base/strings/utf_string_conversions.cc b/base/strings/utf_string_conversions.cc
index 39974b4b2b8f539085e117c93af223c053b08a28..29368d38a659ab0ae4f62b7062e9f52789e3c98b 100644
--- a/base/strings/utf_string_conversions.cc
+++ b/base/strings/utf_string_conversions.cc
@@ -8,7 +8,9 @@
#include <string>
+#include "base/logging.h"
#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversion_utils.h"
namespace {
@@ -58,4 +60,13 @@ std::string UTF16ToUTF8(const string16& utf16) {
return ret;
}
+string16 ASCIIToUTF16(const StringPiece& ascii) {
+ DCHECK(IsStringASCII(ascii)) << ascii;
+ return string16(ascii.begin(), ascii.end());
+}
+
+std::string UTF16ToASCII(const string16& utf16) {
+ DCHECK(IsStringASCII(utf16)) << UTF16ToUTF8(utf16);
+ return std::string(utf16.begin(), utf16.end());
+}
} // namespace
« base/strings/string_util.cc ('K') | « base/strings/utf_string_conversions.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698