Change the battery time display format according m23 spec.

ash/system/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/power/power_status_view.h"
 
 #include "ash/system/power/tray_power.h"
 #include "ash/system/tray/tray_constants.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 96 matching lines @@
     string16 battery_percentage = l10n_util::GetStringFUTF16(
         IDS_ASH_STATUS_TRAY_BATTERY_PERCENT_ONLY,
         base::IntToString16(
             static_cast<int>(supply_status_.battery_percentage)));
     string16 battery_time = string16();
     if (supply_status_.is_calculating_battery_time) {
       battery_time =
           ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
               IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING);
     } else if (hour || min){
+      string16 minute = min < 10 ?
+          ASCIIToUTF16("0") + base::IntToString16(min) :
+          base::IntToString16(min);
       battery_time =
           l10n_util::GetStringFUTF16(
               IDS_ASH_STATUS_TRAY_BATTERY_TIME_ONLY,
               base::IntToString16(hour),
-              base::IntToString16(min)) +
-          ASCIIToUTF16(" - ");
+              minute);
     }
-    string16 battery_status = battery_time + battery_percentage;
+    string16 battery_status = battery_time.empty() ?
+        battery_percentage :
+        battery_percentage + ASCIIToUTF16(" - ") + battery_time;
     time_status_label_->SetText(battery_status);
   }
 }
 
 void PowerStatusView::UpdateTextForNotificationView() {
   int hour = 0;
   int min = 0;
   if (!supply_status_.is_calculating_battery_time) {
     base::TimeDelta time = base::TimeDelta::FromSeconds(
         supply_status_.line_power_on ?
@@ skipping 13 matching lines @@
             IDS_ASH_STATUS_TRAY_BATTERY_PERCENT,
             base::IntToString16(
                 static_cast<int>(supply_status_.battery_percentage))));
   }
 
   if (supply_status_.is_calculating_battery_time) {
     time_label_->SetText(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING));
   } else if (hour || min) {
-    time_label_->SetText(
+    if (supply_status_.line_power_on) {
+      time_label_->SetText(
         l10n_util::GetStringFUTF16(
-            supply_status_.line_power_on ?
-            IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL :
-            IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_EMPTY,
+            IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL,
             base::IntToString16(hour),
             base::IntToString16(min)));
+    } else {
+        // This is a low battery warning, which prompts user when battery
+        // time left is not much (ie in minutes).
+        min = hour * 60 + min;
+        time_label_->SetText(
+            l10n_util::GetStringFUTF16(
+                IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_EMPTY,
+                base::IntToString16(min)));
+    }
   } else {
     time_label_->SetText(string16());
   }
 
 }
 
 void PowerStatusView::UpdateIcon() {
   if (icon_) {
     icon_->SetImage(TrayPower::GetBatteryImage(supply_status_, ICON_DARK));
     icon_->SetVisible(true);
   }
 }
 
 void PowerStatusView::Update() {
   UpdateText();
   UpdateIcon();
 }
 
 void PowerStatusView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
 gfx::Size PowerStatusView::GetPreferredSize() {
   gfx::Size size = views::View::GetPreferredSize();
   return gfx::Size(size.width(), kTrayPopupItemHeight);
 }
 
 }  // namespace internal
 }  // namespace ash