From 5cca3a55b3f1c25c5b3a19c3b42227aae34e4abf Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Tue, 19 Aug 2008 22:35:29 +0000 Subject: Move time formatters that only use ICU into base/time.* This allows us to use the time formatters in, e.g., net or webkit. Remove CookieExpires since it's not used. BUG=1164516 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1063 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/options/cookies_view.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/views') diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index 8d93fed..142a62b8 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -32,6 +32,7 @@ #include "chrome/browser/views/options/cookies_view.h" #include "base/string_util.h" +#include "base/time_format.h" #include "chrome/app/locales/locale_settings.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/standard_layout.h" @@ -39,7 +40,6 @@ #include "chrome/common/gfx/color_utils.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" -#include "chrome/common/time_format.h" #include "chrome/common/win_util.h" #include "chrome/views/border.h" #include "chrome/views/grid_layout.h" @@ -403,11 +403,11 @@ void CookieInfoView::SetCookie( domain_value_field_->SetText(UTF8ToWide(domain)); path_value_field_->SetText(UTF8ToWide(cookie.Path())); created_value_field_->SetText( - TimeFormat::FriendlyDateAndTime(cookie.CreationDate())); + base::TimeFormatFriendlyDateAndTime(cookie.CreationDate())); if (cookie.DoesExpire()) { expires_value_field_->SetText( - TimeFormat::FriendlyDateAndTime(cookie.ExpiryDate())); + base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate())); } else { // TODO(deanm) need a string that the average user can understand // "When you quit or restart your browser" ? -- cgit v1.1