diff options
| author | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 19:17:45 +0000 |
|---|---|---|
| committer | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 19:17:45 +0000 |
| commit | e2219171711f7acf49a52ba89eb6e05c27f11103 (patch) | |
| tree | 464c5ec96e0a288bf0460d9d7109d12f9bd29207 /net/base/net_util.cc | |
| parent | 5e5bf59cbc75839aafef3ae29bcb53408adb715d (diff) | |
| download | chromium_src-e2219171711f7acf49a52ba89eb6e05c27f11103.zip chromium_src-e2219171711f7acf49a52ba89eb6e05c27f11103.tar.gz chromium_src-e2219171711f7acf49a52ba89eb6e05c27f11103.tar.bz2 | |
Change the string_escape functions to use string16 rather than wstring.
Review URL: http://codereview.chromium.org/27116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_util.cc')
| -rw-r--r-- | net/base/net_util.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 5c042d1..7cee8f1 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -848,14 +848,15 @@ std::string GetDirectoryListingEntry(const std::string& name, } string_escape::JavascriptDoubleQuote( - FormatBytes(size, GetByteDisplayUnits(size), true), true, &result); + WideToUTF16Hack(FormatBytes(size, GetByteDisplayUnits(size), true)), true, + &result); result.append(","); - std::wstring modified_str; + string16 modified_str; // |modified| can be NULL in FTP listings. if (!modified.is_null()) { - modified_str = base::TimeFormatShortDateAndTime(modified); + modified_str = WideToUTF16Hack(base::TimeFormatShortDateAndTime(modified)); } string_escape::JavascriptDoubleQuote(modified_str, true, &result); |