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

ash/system/chromeos/power/power_status_view.cc

 // Copyright (c) 2012 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_view.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/chromeos/power/power_status.h"
 #include "ash/system/chromeos/power/tray_power.h"
@@ skipping 168 matching lines @@
     int hour = 0, min = 0;
     PowerStatus::SplitTimeIntoHoursAndMinutes(time, &hour, &min);
     if (status.IsBatteryCharging()) {
       time_label_->SetText(
           l10n_util::GetStringFUTF16(
               IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL,
               base::IntToString16(hour),
               base::IntToString16(min)));
     } else {
       // This is a low battery warning prompting the user in minutes.
-      time_label_->SetText(ui::TimeFormat::TimeRemainingLong(
+      time_label_->SetText(ui::TimeFormat::Simple(
+          ui::TimeFormat::FORMAT_REMAINING, ui::TimeFormat::LENGTH_LONG,
           base::TimeDelta::FromMinutes(hour * 60 + min)));
     }
   } else {
     time_label_->SetText(base::string16());
   }
 }
 
 void PowerStatusView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
@@ skipping 12 matching lines @@
 
   // Move the time_status_label_ closer to percentage_label_.
   if (percentage_label_ && time_status_label_ &&
       percentage_label_->visible() && time_status_label_->visible()) {
     time_status_label_->SetX(percentage_label_->bounds().right() + 1);
   }
 }
 
 }  // namespace internal
 }  // namespace ash