Fix ChromeOS clock menu so that it can show 12-hour clock in all locales.

chrome/browser/chromeos/status/clock_menu_button.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/browser/chromeos/status/clock_menu_button.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 70 matching lines @@
   timer_.Start(base::TimeDelta::FromSeconds(seconds_left), this,
                &ClockMenuButton::UpdateTextAndSetNextTimer);
 }
 
 void ClockMenuButton::UpdateText() {
   base::Time time(base::Time::Now());
   // If the profie is present, check the use 24-hour clock preference.
   const bool use_24hour_clock =
       host_->GetProfile() &&
       host_->GetProfile()->GetPrefs()->GetBoolean(prefs::kUse24HourClock);
-  if (use_24hour_clock) {
-    SetText(UTF16ToWide(base::TimeFormatTimeOfDayWithHourClockType(
-        time, base::k24HourClock)));
-  } else {
-    // Remove the am/pm field if it's present.
-    scoped_ptr<icu::DateFormat> formatter(
-        icu::DateFormat::createTimeInstance(icu::DateFormat::kShort));
-    icu::UnicodeString time_string;
-    icu::FieldPosition ampm_field(icu::DateFormat::kAmPmField);
-    formatter->format(
-        static_cast<UDate>(time.ToDoubleT() * 1000), time_string, ampm_field);
-    int ampm_length = ampm_field.getEndIndex() - ampm_field.getBeginIndex();
-    if (ampm_length) {
-      int begin = ampm_field.getBeginIndex();
-      // Doesn't include any spacing before the field.
-      if (begin)
-        begin--;
-      time_string.removeBetween(begin, ampm_field.getEndIndex());
-    }
-    string16 time_string16 =
-        string16(time_string.getBuffer(),
-                 static_cast<size_t>(time_string.length()));
-    SetText(UTF16ToWide(time_string16));
-  }
+  SetText(UTF16ToWide(base::TimeFormatTimeOfDayWithHourClockType(
+      time,
+      use_24hour_clock ? base::k24HourClock : base::k12HourClock,
+      base::kDropAmPm)));
   SetTooltipText(UTF16ToWide(base::TimeFormatShortDate(time)));
   SchedulePaint();
 }
 
 // ClockMenuButton, NotificationObserver implementation:
 
 void ClockMenuButton::Observe(NotificationType type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
@@ skipping 86 matching lines @@
       const string16 clock_open_options_label =
           l10n_util::GetStringUTF16(IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG);
       menu_->AppendMenuItemWithLabel(
           CLOCK_OPEN_OPTIONS_ITEM,
           UTF16ToWide(clock_open_options_label));
     }
   }
 }
 
 }  // namespace chromeos