| Index: chrome/browser/dom_ui/options/cookies_view_handler.cc
|
| ===================================================================
|
| --- chrome/browser/dom_ui/options/cookies_view_handler.cc (revision 69833)
|
| +++ chrome/browser/dom_ui/options/cookies_view_handler.cc (working copy)
|
| @@ -85,9 +85,9 @@
|
| dict->SetString(kKeySendFor, cookie.IsSecure() ?
|
| l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_SENDFOR_SECURE) :
|
| l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_SENDFOR_ANY));
|
| - dict->SetString(kKeyCreated, WideToUTF8(
|
| + dict->SetString(kKeyCreated, UTF16ToUTF8(
|
| base::TimeFormatFriendlyDateAndTime(cookie.CreationDate())));
|
| - dict->SetString(kKeyExpires, cookie.DoesExpire() ? WideToUTF8(
|
| + dict->SetString(kKeyExpires, cookie.DoesExpire() ? UTF16ToUTF8(
|
| base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate())) :
|
| l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_EXPIRES_SESSION));
|
|
|
| @@ -108,7 +108,7 @@
|
| FormatBytes(database_info.size,
|
| GetByteDisplayUnits(database_info.size),
|
| true));
|
| - dict->SetString(kKeyModified, WideToUTF8(
|
| + dict->SetString(kKeyModified, UTF16ToUTF8(
|
| base::TimeFormatFriendlyDateAndTime(database_info.last_modified)));
|
|
|
| break;
|
| @@ -125,7 +125,7 @@
|
| FormatBytes(local_storage_info.size,
|
| GetByteDisplayUnits(local_storage_info.size),
|
| true));
|
| - dict->SetString(kKeyModified, WideToUTF8(
|
| + dict->SetString(kKeyModified, UTF16ToUTF8(
|
| base::TimeFormatFriendlyDateAndTime(
|
| local_storage_info.last_modified)));
|
|
|
| @@ -143,9 +143,9 @@
|
| FormatBytes(appcache_info.size,
|
| GetByteDisplayUnits(appcache_info.size),
|
| true));
|
| - dict->SetString(kKeyCreated, WideToUTF8(
|
| + dict->SetString(kKeyCreated, UTF16ToUTF8(
|
| base::TimeFormatFriendlyDateAndTime(appcache_info.creation_time)));
|
| - dict->SetString(kKeyAccessed, WideToUTF8(
|
| + dict->SetString(kKeyAccessed, UTF16ToUTF8(
|
| base::TimeFormatFriendlyDateAndTime(appcache_info.last_access_time)));
|
|
|
| break;
|
| @@ -162,7 +162,7 @@
|
| FormatBytes(indexed_db_info.size,
|
| GetByteDisplayUnits(indexed_db_info.size),
|
| true));
|
| - dict->SetString(kKeyModified, WideToUTF8(
|
| + dict->SetString(kKeyModified, UTF16ToUTF8(
|
| base::TimeFormatFriendlyDateAndTime(indexed_db_info.last_modified)));
|
|
|
| break;
|
|
|