summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/options
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-19 22:35:29 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-19 22:35:29 +0000
commit5cca3a55b3f1c25c5b3a19c3b42227aae34e4abf (patch)
tree01cd3db90399f7c24d3aea3593fd2d5feb35f106 /chrome/browser/views/options
parentaac13f594195df51eb1e4e35ea2863659cb4de54 (diff)
downloadchromium_src-5cca3a55b3f1c25c5b3a19c3b42227aae34e4abf.zip
chromium_src-5cca3a55b3f1c25c5b3a19c3b42227aae34e4abf.tar.gz
chromium_src-5cca3a55b3f1c25c5b3a19c3b42227aae34e4abf.tar.bz2
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
Diffstat (limited to 'chrome/browser/views/options')
-rw-r--r--chrome/browser/views/options/cookies_view.cc6
1 files changed, 3 insertions, 3 deletions
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" ?