Add FORMAT_REMAINING_LONG in TimeFormat class to support formatting remaining time in long minute f…

chrome/common/time_format.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/time_format.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 61 matching lines @@
     IDS_TIME_REMAINING_HOURS_ZERO, IDS_TIME_REMAINING_HOURS_TWO,
     IDS_TIME_REMAINING_HOURS_FEW, IDS_TIME_REMAINING_HOURS_MANY
   },
   {
     IDS_TIME_REMAINING_DAYS_DEFAULT, IDS_TIME_REMAINING_DAY_SINGULAR,
     IDS_TIME_REMAINING_DAYS_ZERO, IDS_TIME_REMAINING_DAYS_TWO,
     IDS_TIME_REMAINING_DAYS_FEW, IDS_TIME_REMAINING_DAYS_MANY
   }
 } };
 
+static const MessageIDs kTimeRemainingLongMessageIDs = { {
+  {
+    IDS_TIME_REMAINING_SECS_DEFAULT, IDS_TIME_REMAINING_SEC_SINGULAR,
+    IDS_TIME_REMAINING_SECS_ZERO, IDS_TIME_REMAINING_SECS_TWO,
+    IDS_TIME_REMAINING_SECS_FEW, IDS_TIME_REMAINING_SECS_MANY
+  },
+  {
+    IDS_TIME_REMAINING_LONG_MINS_DEFAULT, IDS_TIME_REMAINING_LONG_MIN_SINGULAR,
+    IDS_TIME_REMAINING_LONG_MINS_ZERO, IDS_TIME_REMAINING_LONG_MINS_TWO,
+    IDS_TIME_REMAINING_LONG_MINS_FEW, IDS_TIME_REMAINING_LONG_MINS_MANY
+  },
+  {
+    IDS_TIME_REMAINING_HOURS_DEFAULT, IDS_TIME_REMAINING_HOUR_SINGULAR,
+    IDS_TIME_REMAINING_HOURS_ZERO, IDS_TIME_REMAINING_HOURS_TWO,
+    IDS_TIME_REMAINING_HOURS_FEW, IDS_TIME_REMAINING_HOURS_MANY
+  },
+  {
+    IDS_TIME_REMAINING_DAYS_DEFAULT, IDS_TIME_REMAINING_DAY_SINGULAR,
+    IDS_TIME_REMAINING_DAYS_ZERO, IDS_TIME_REMAINING_DAYS_TWO,
+    IDS_TIME_REMAINING_DAYS_FEW, IDS_TIME_REMAINING_DAYS_MANY
+  }
+} };
+
 static const MessageIDs kTimeElapsedMessageIDs = { {
   {
     IDS_TIME_ELAPSED_SECS_DEFAULT, IDS_TIME_ELAPSED_SEC_SINGULAR,
     IDS_TIME_ELAPSED_SECS_ZERO, IDS_TIME_ELAPSED_SECS_TWO,
     IDS_TIME_ELAPSED_SECS_FEW, IDS_TIME_ELAPSED_SECS_MANY
   },
   {
     IDS_TIME_ELAPSED_MINS_DEFAULT, IDS_TIME_ELAPSED_MIN_SINGULAR,
     IDS_TIME_ELAPSED_MINS_ZERO, IDS_TIME_ELAPSED_MINS_TWO,
     IDS_TIME_ELAPSED_MINS_FEW, IDS_TIME_ELAPSED_MINS_MANY
   },
   {
     IDS_TIME_ELAPSED_HOURS_DEFAULT, IDS_TIME_ELAPSED_HOUR_SINGULAR,
     IDS_TIME_ELAPSED_HOURS_ZERO, IDS_TIME_ELAPSED_HOURS_TWO,
     IDS_TIME_ELAPSED_HOURS_FEW, IDS_TIME_ELAPSED_HOURS_MANY
   },
   {
     IDS_TIME_ELAPSED_DAYS_DEFAULT, IDS_TIME_ELAPSED_DAY_SINGULAR,
     IDS_TIME_ELAPSED_DAYS_ZERO, IDS_TIME_ELAPSED_DAYS_TWO,
     IDS_TIME_ELAPSED_DAYS_FEW, IDS_TIME_ELAPSED_DAYS_MANY
   }
 } };
 
 // Different format types.
 enum FormatType {
   FORMAT_SHORT,
   FORMAT_REMAINING,
+  FORMAT_REMAINING_LONG,
   FORMAT_ELAPSED,
 };
 
 }  // namespace
 
 class TimeFormatter {
   public:
     const std::vector<icu::PluralFormat*>& formatter(FormatType format_type) {
       switch (format_type) {
         case FORMAT_SHORT:
           return short_formatter_;
         case FORMAT_REMAINING:
           return time_left_formatter_;
+        case FORMAT_REMAINING_LONG:
+          return time_left_long_formatter_;
         case FORMAT_ELAPSED:
           return time_elapsed_formatter_;
         default:
           NOTREACHED();
           return short_formatter_;
       }
     }
   private:
     static const MessageIDs& GetMessageIDs(FormatType format_type) {
       switch (format_type) {
         case FORMAT_SHORT:
           return kTimeShortMessageIDs;
         case FORMAT_REMAINING:
           return kTimeRemainingMessageIDs;
+        case FORMAT_REMAINING_LONG:
+          return kTimeRemainingLongMessageIDs;
         case FORMAT_ELAPSED:
           return kTimeElapsedMessageIDs;
         default:
           NOTREACHED();
           return kTimeShortMessageIDs;
       }
     }
 
     static const char* GetFallbackFormatSuffix(FormatType format_type) {
       switch (format_type) {
         case FORMAT_SHORT:
           return kFallbackFormatSuffixShort;
         case FORMAT_REMAINING:
+        case FORMAT_REMAINING_LONG:
           return kFallbackFormatSuffixLeft;
         case FORMAT_ELAPSED:
           return kFallbackFormatSuffixAgo;
         default:
           NOTREACHED();
           return kFallbackFormatSuffixShort;
       }
     }
 
     TimeFormatter() {
       BuildFormats(FORMAT_SHORT, &short_formatter_);
       BuildFormats(FORMAT_REMAINING, &time_left_formatter_);
+      BuildFormats(FORMAT_REMAINING_LONG, &time_left_long_formatter_);
       BuildFormats(FORMAT_ELAPSED, &time_elapsed_formatter_);
     }
     ~TimeFormatter() {
       STLDeleteContainerPointers(short_formatter_.begin(),
                                  short_formatter_.end());
       STLDeleteContainerPointers(time_left_formatter_.begin(),
                                  time_left_formatter_.end());
+      STLDeleteContainerPointers(time_left_long_formatter_.begin(),
+                                 time_left_long_formatter_.end());
       STLDeleteContainerPointers(time_elapsed_formatter_.begin(),
                                  time_elapsed_formatter_.end());
     }
     friend struct base::DefaultLazyInstanceTraits<TimeFormatter>;
 
     std::vector<icu::PluralFormat*> short_formatter_;
     std::vector<icu::PluralFormat*> time_left_formatter_;
+    std::vector<icu::PluralFormat*> time_left_long_formatter_;
     std::vector<icu::PluralFormat*> time_elapsed_formatter_;
     static void BuildFormats(FormatType format_type,
                              std::vector<icu::PluralFormat*>* time_formats);
     static icu::PluralFormat* createFallbackFormat(
         const icu::PluralRules& rules, int index, FormatType format_type);
 
     DISALLOW_COPY_AND_ASSIGN(TimeFormatter);
 };
 
 static base::LazyInstance<TimeFormatter> g_time_formatter =
@@ skipping 123 matching lines @@
 string16 TimeFormat::TimeElapsed(const TimeDelta& delta) {
   return FormatTimeImpl(delta, FORMAT_ELAPSED);
 }
 
 // static
 string16 TimeFormat::TimeRemaining(const TimeDelta& delta) {
   return FormatTimeImpl(delta, FORMAT_REMAINING);
 }
 
 // static
+string16 TimeFormat::TimeRemainingLong(const TimeDelta& delta) {
+  return FormatTimeImpl(delta, FORMAT_REMAINING_LONG);
+}
+
+// static
 string16 TimeFormat::TimeRemainingShort(const TimeDelta& delta) {
   return FormatTimeImpl(delta, FORMAT_SHORT);
 }
 
 // static
 string16 TimeFormat::RelativeDate(
     const Time& time,
     const Time* optional_midnight_today) {
   Time midnight_today = optional_midnight_today ? *optional_midnight_today :
       Time::Now().LocalMidnight();
   TimeDelta day = TimeDelta::FromMicroseconds(Time::kMicrosecondsPerDay);
   Time tomorrow = midnight_today + day;
   Time yesterday = midnight_today - day;
   if (time >= tomorrow)
     return string16();
   else if (time >= midnight_today)
     return l10n_util::GetStringUTF16(IDS_PAST_TIME_TODAY);
   else if (time >= yesterday)
     return l10n_util::GetStringUTF16(IDS_PAST_TIME_YESTERDAY);
   return string16();
 }