Add month and year to time_format.

ui/base/l10n/formatter.h

 // Copyright 2014 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.
 
 // This file contains implementation details, the public interface is declared
 // in time_format.h.
 
 #ifndef UI_BASE_L10N_FORMATTER_H_
 #define UI_BASE_L10N_FORMATTER_H_
 
 #include <memory>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "third_party/icu/source/common/unicode/unistr.h"
 #include "third_party/icu/source/i18n/unicode/msgfmt.h"
 #include "third_party/icu/source/i18n/unicode/plurrule.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 struct Pluralities;
 
 // Formatter for a (format, length) combination.  May either be instantiated
-// with four parameters for use in TimeFormat::Simple() or with ten parameters
+// with six parameters for use in TimeFormat::Simple() or with twelve parameters
 // for use in TimeFormat::Detailed().
 class Formatter {
  public:
   enum Unit {
     UNIT_SEC,
     UNIT_MIN,
     UNIT_HOUR,
     UNIT_DAY,
+    UNIT_MONTH,
+    UNIT_YEAR,
     UNIT_COUNT  // Enum size counter, not a unit.  Must be last.
   };
   enum TwoUnits {
     TWO_UNITS_MIN_SEC,
     TWO_UNITS_HOUR_MIN,
     TWO_UNITS_DAY_HOUR,
     TWO_UNITS_COUNT      // Enum size counter, not a unit pair.  Must be last.
   };
 
   Formatter(const Pluralities& sec_pluralities,
             const Pluralities& min_pluralities,
             const Pluralities& hour_pluralities,
-            const Pluralities& day_pluralities);
+            const Pluralities& day_pluralities,
+            const Pluralities& month_pluralities,
+            const Pluralities& year_pluralities);
 
   Formatter(const Pluralities& sec_pluralities,
             const Pluralities& min_pluralities,
             const Pluralities& hour_pluralities,
             const Pluralities& day_pluralities,
+            const Pluralities& month_pluralities,
+            const Pluralities& year_pluralities,
             const Pluralities& min_sec_pluralities1,
             const Pluralities& min_sec_pluralities2,
             const Pluralities& hour_min_pluralities1,
             const Pluralities& hour_min_pluralities2,
             const Pluralities& day_hour_pluralities1,
             const Pluralities& day_hour_pluralities2);
 
   void Format(Unit unit, int value, icu::UnicodeString* formatted_string) const;
 
   void Format(TwoUnits units,
@@ skipping 44 matching lines @@
 // Windows compilation requires full definition of FormatterContainer before
 // LazyInstance<FormatterContainter> may be declared.
 extern UI_BASE_EXPORT base::LazyInstance<FormatterContainer>::Leaky g_container;
 
 // For use in unit tests only.
 extern UI_BASE_EXPORT bool formatter_force_fallback;
 
 }  // namespace ui
 
 #endif  // UI_BASE_L10N_FORMATTER_H_