summaryrefslogtreecommitdiffstats
path: root/base/string_util.h
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 21:27:55 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 21:27:55 +0000
commit55150c49fc13a00944360b803cec2b6598585b54 (patch)
tree0b43c3b22da6eef65c515aa85208700cd1387d97 /base/string_util.h
parentb8a92ac4ed6dc5f3bd4c3c0066059df313853c77 (diff)
downloadchromium_src-55150c49fc13a00944360b803cec2b6598585b54.zip
chromium_src-55150c49fc13a00944360b803cec2b6598585b54.tar.gz
chromium_src-55150c49fc13a00944360b803cec2b6598585b54.tar.bz2
Revert "ASCII <-> UTF16 conversion functions. These are just copies of WideToASCII and"
Review URL: http://codereview.chromium.org/28217 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/string_util.h')
-rw-r--r--base/string_util.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/base/string_util.h b/base/string_util.h
index 93b4898..500a114 100644
--- a/base/string_util.h
+++ b/base/string_util.h
@@ -156,11 +156,9 @@ TrimPositions TrimWhitespace(const std::string& input,
std::wstring CollapseWhitespace(const std::wstring& text,
bool trim_sequences_with_line_breaks);
-// These convert between ASCII (7-bit) and Wide/UTF16 strings.
+// These convert between ASCII (7-bit) and UTF16 strings.
std::string WideToASCII(const std::wstring& wide);
std::wstring ASCIIToWide(const std::string& ascii);
-std::string UTF16ToASCII(const string16& utf16);
-string16 ASCIIToUTF16(const std::string& ascii);
// These convert between UTF-8, -16, and -32 strings. They are potentially slow,
// so avoid unnecessary conversions. The low-level versions return a boolean
@@ -237,7 +235,6 @@ bool IsStringUTF8(const std::string& str);
bool IsStringWideUTF8(const std::wstring& str);
bool IsStringASCII(const std::wstring& str);
bool IsStringASCII(const std::string& str);
-bool IsStringASCII(const string16& str);
// ASCII-specific tolower. The standard library's tolower is locale sensitive,
// so we don't want to use it here.