diff options
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/history2_ui.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/history_ui.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/options/cookies_view_handler.cc | 14 |
3 files changed, 15 insertions, 17 deletions
diff --git a/chrome/browser/dom_ui/history2_ui.cc b/chrome/browser/dom_ui/history2_ui.cc index 0e72376..faf00cb 100644 --- a/chrome/browser/dom_ui/history2_ui.cc +++ b/chrome/browser/dom_ui/history2_ui.cc @@ -276,20 +276,19 @@ void BrowsingHistoryHandler2::QueryComplete( string16 date_str = TimeFormat::RelativeDate(page.visit_time(), &midnight_today); if (date_str.empty()) { - date_str = - WideToUTF16Hack(base::TimeFormatFriendlyDate(page.visit_time())); + date_str = base::TimeFormatFriendlyDate(page.visit_time()); } else { date_str = l10n_util::GetStringFUTF16( IDS_HISTORY_DATE_WITH_RELATIVE_TIME, date_str, - WideToUTF16Hack(base::TimeFormatFriendlyDate(page.visit_time()))); + base::TimeFormatFriendlyDate(page.visit_time())); } page_value->SetString("dateRelativeDay", date_str); page_value->SetString("dateTimeOfDay", - WideToUTF16Hack(base::TimeFormatTimeOfDay(page.visit_time()))); + base::TimeFormatTimeOfDay(page.visit_time())); } else { page_value->SetString("dateShort", - WideToUTF16Hack(base::TimeFormatShortDate(page.visit_time()))); + base::TimeFormatShortDate(page.visit_time())); page_value->SetString("snippet", page.snippet().text()); } page_value->SetBoolean("starred", diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index 23581c9..fa7c332 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -276,20 +276,19 @@ void BrowsingHistoryHandler::QueryComplete( string16 date_str = TimeFormat::RelativeDate(page.visit_time(), &midnight_today); if (date_str.empty()) { - date_str = - WideToUTF16Hack(base::TimeFormatFriendlyDate(page.visit_time())); + date_str = base::TimeFormatFriendlyDate(page.visit_time()); } else { date_str = l10n_util::GetStringFUTF16( IDS_HISTORY_DATE_WITH_RELATIVE_TIME, date_str, - WideToUTF16Hack(base::TimeFormatFriendlyDate(page.visit_time()))); + base::TimeFormatFriendlyDate(page.visit_time())); } page_value->SetString("dateRelativeDay", date_str); page_value->SetString("dateTimeOfDay", - WideToUTF16Hack(base::TimeFormatTimeOfDay(page.visit_time()))); + base::TimeFormatTimeOfDay(page.visit_time())); } else { page_value->SetString("dateShort", - WideToUTF16Hack(base::TimeFormatShortDate(page.visit_time()))); + base::TimeFormatShortDate(page.visit_time())); page_value->SetString("snippet", page.snippet().text()); } page_value->SetBoolean("starred", diff --git a/chrome/browser/dom_ui/options/cookies_view_handler.cc b/chrome/browser/dom_ui/options/cookies_view_handler.cc index 67a10ad..5cfeb7a 100644 --- a/chrome/browser/dom_ui/options/cookies_view_handler.cc +++ b/chrome/browser/dom_ui/options/cookies_view_handler.cc @@ -85,9 +85,9 @@ void GetCookieTreeNodeDictionary(const CookieTreeNode& node, 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 @@ void GetCookieTreeNodeDictionary(const CookieTreeNode& node, 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 @@ void GetCookieTreeNodeDictionary(const CookieTreeNode& node, 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 @@ void GetCookieTreeNodeDictionary(const CookieTreeNode& node, 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 @@ void GetCookieTreeNodeDictionary(const CookieTreeNode& node, 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; |