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

4 files changed, 164 insertions, 0 deletions

diff --git a/base/SConscript b/base/SConscript
index 4a06cbd..190fdfd 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -83,6 +83,7 @@ input_files = [
     'string_util.cc',
     'string_util_icu.cc',
     'time.cc',
+    'time_format.cc',
     'timer.cc',
     'tracked.cc',
     'tracked_objects.cc',
diff --git a/base/build/base.vcproj b/base/build/base.vcproj
index 7fc1bfb..e4c00d1 100644
--- a/base/build/base.vcproj
+++ b/base/build/base.vcproj
@@ -710,6 +710,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\time_format.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\time_format.h"
+			>
+		</File>
+		<File
 			RelativePath="..\timer.cc"
 			>
 		</File>
diff --git a/base/time_format.cc b/base/time_format.cc
new file mode 100644
index 0000000..8d2d39e
--- /dev/null
+++ b/base/time_format.cc
@@ -0,0 +1,90 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "base/time_format.h"
+
+#include "base/logging.h"
+#include "base/string_util.h"
+#include "base/time.h"
+#include "unicode/datefmt.h"
+
+namespace {
+
+std::wstring TimeFormat(const DateFormat* formatter,
+                        const Time& time) {
+  DCHECK(formatter);
+  UnicodeString date_string;
+  
+  formatter->format(static_cast<UDate>(time.ToDoubleT() * 1000), date_string);
+  return UTF16ToWide(date_string.getTerminatedBuffer());
+}
+
+}
+
+namespace base {
+
+std::wstring TimeFormatTimeOfDay(const Time& time) {
+  // We can omit the locale parameter because the default should match
+  // Chrome's application locale.
+  scoped_ptr<DateFormat> formatter(DateFormat::createTimeInstance(
+      DateFormat::kShort));
+  return TimeFormat(formatter.get(), time);
+}
+
+std::wstring TimeFormatShortDate(const Time& time) {
+  scoped_ptr<DateFormat> formatter(DateFormat::createDateInstance(
+      DateFormat::kMedium));
+  return TimeFormat(formatter.get(), time);
+}
+
+std::wstring TimeFormatShortDateNumeric(const Time& time) {
+  scoped_ptr<DateFormat> formatter(DateFormat::createDateInstance(
+      DateFormat::kShort));
+  return TimeFormat(formatter.get(), time);
+}
+
+std::wstring TimeFormatShortDateAndTime(const Time& time) {
+   scoped_ptr<DateFormat> formatter(DateFormat::createDateTimeInstance(
+      DateFormat::kShort));
+  return TimeFormat(formatter.get(), time);
+}
+
+std::wstring TimeFormatFriendlyDateAndTime(const Time& time) {
+   scoped_ptr<DateFormat> formatter(DateFormat::createDateTimeInstance(
+      DateFormat::kFull));
+  return TimeFormat(formatter.get(), time);
+}
+
+std::wstring TimeFormatFriendlyDate(const Time& time) {
+  scoped_ptr<DateFormat> formatter(DateFormat::createDateInstance(
+      DateFormat::kFull));
+  return TimeFormat(formatter.get(), time);
+}
+
+}  // namespace base
diff --git a/base/time_format.h b/base/time_format.h
new file mode 100644
index 0000000..477ef0a
--- /dev/null
+++ b/base/time_format.h
@@ -0,0 +1,65 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Basic time formatting methods.  These methods use the current locale
+// formatting for displaying the time.
+
+#ifndef BASE_TIME_FORMAT_H_
+#define BASE_TIME_FORMAT_H_
+
+#include <string>
+
+class Time;
+
+namespace base {
+
+// Returns the time of day, e.g., "3:07 PM".
+std::wstring TimeFormatTimeOfDay(const Time& time);
+
+// Returns a shortened date, e.g. "Nov 7, 2007"
+std::wstring TimeFormatShortDate(const Time& time);
+
+// Returns a numeric date such as 12/13/52.
+std::wstring TimeFormatShortDateNumeric(const Time& time);
+
+// Formats a time in a friendly sentence format, e.g.
+// "Monday, March 6, 2008 2:44:30 PM".
+std::wstring TimeFormatShortDateAndTime(const Time& time);
+
+// Formats a time in a friendly sentence format, e.g.
+// "Monday, March 6, 2008 2:44:30 PM".
+std::wstring TimeFormatFriendlyDateAndTime(const Time& time);
+
+// Formats a time in a friendly sentence format, e.g.
+// "Monday, March 6, 2008".
+std::wstring TimeFormatFriendlyDate(const Time& time);
+
+}  // namespace base
+
+#endif  // BASE_TIME_FORMAT_H_