diff options
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); |