summaryrefslogtreecommitdiffstats
path: root/base/string_util.h
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-01 00:49:29 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-01 00:49:29 +0000
commit856080bd99e86a1eb6f1eb034f65657d03d1f095 (patch)
treeb3e4b2b2fd68ffc0646b414b92a26493e2ba5886 /base/string_util.h
parent7db65fdab1d5f59df3bc6c4ed49dd6e0fd4facff (diff)
downloadchromium_src-856080bd99e86a1eb6f1eb034f65657d03d1f095.zip
chromium_src-856080bd99e86a1eb6f1eb034f65657d03d1f095.tar.gz
chromium_src-856080bd99e86a1eb6f1eb034f65657d03d1f095.tar.bz2
Revert my UTF change until we can figure out what to do with the sandbox.
BUG=1201008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/string_util.h')
-rw-r--r--base/string_util.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/base/string_util.h b/base/string_util.h
index 340a7eb..e5fd147 100644
--- a/base/string_util.h
+++ b/base/string_util.h
@@ -155,15 +155,9 @@ std::wstring CollapseWhitespace(const std::wstring& text,
std::string WideToASCII(const std::wstring& wide);
std::wstring ASCIIToWide(const std::string& ascii);
-// These convert between UTF8 and UTF16 strings. They are potentially slow, so
-// avoid unnecessary conversions. Most things should be in wide. The low-level
-// versions return a boolean indicating whether the conversion was 100% valid.
-// In this case, it will still do the best it can and put the result in the
-// output buffer. The versions that return strings ignore this error and just
-// return the best conversion possible.
-bool WideToUTF8(const wchar_t* src, size_t src_len, std::string* output);
+// These convert between UTF8 and UTF16 strings. They are potentially slow,
+// so avoid unnecessary conversions. Most things should be in UTF16.
std::string WideToUTF8(const std::wstring& wide);
-bool UTF8ToWide(const char* src, size_t src_len, std::wstring* output);
std::wstring UTF8ToWide(const std::string& utf8);
// Converts between wide strings and whatever the native multibyte encoding