Add support for localized time strings with two units, eg. "2 hours 17 minutes"

ash/system/chromeos/power/power_status.cc

 // Copyright (c) 2013 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 "ash/system/chromeos/power/power_status.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/shell.h"
@@ skipping 30 matching lines @@
         power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED;
     if ((on_line_power && proto->battery_time_to_full_sec() < 0) ||
         (!on_line_power && proto->battery_time_to_empty_sec() < 0))
       proto->set_is_calculating_battery_time(true);
   }
 }
 
 base::string16 GetBatteryTimeAccessibilityString(int hour, int min) {
   DCHECK(hour || min);
   if (hour && !min) {
-    return ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromHours(hour));
+    return ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_DURATION,
+                                  ui::TimeFormat::LENGTH_LONG,
+                                  base::TimeDelta::FromHours(hour));
   }
   if (min && !hour) {
-    return ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromMinutes(min));
+    return ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_DURATION,
+                                  ui::TimeFormat::LENGTH_LONG,
+                                  base::TimeDelta::FromMinutes(min));
   }
   return l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_BATTERY_TIME_ACCESSIBLE,
-      ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromHours(hour)),
-      ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromMinutes(min)));
+      ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_DURATION,
+                             ui::TimeFormat::LENGTH_LONG,
+                             base::TimeDelta::FromHours(hour)),
+      ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_DURATION,
+                             ui::TimeFormat::LENGTH_LONG,
+                             base::TimeDelta::FromMinutes(min)));
 }
 
 static PowerStatus* g_power_status = NULL;
 
 // Minimum battery percentage rendered in UI.
 const int kMinBatteryPercent = 1;
 
 // Width and height of battery images.
 const int kBatteryImageHeight = 25;
 const int kBatteryImageWidth = 25;
@@ skipping 222 matching lines @@
 
 void PowerStatus::PowerChanged(
     const power_manager::PowerSupplyProperties& proto) {
   proto_ = proto;
   SanitizeProto(&proto_);
   FOR_EACH_OBSERVER(Observer, observers_, OnPowerStatusChanged());
 }
 
 }  // namespace internal
 }  // namespace ash