ash: Show 'calculating' when the battery time is still being computed, instead of showing incorrec…

ash/system/power/tray_power.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/tray_power.h"
 
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 103 matching lines @@
     supply_status_ = status;
     // Sanitize.
     if (supply_status_.battery_is_full)
       supply_status_.battery_percentage = 100.0;
 
     UpdateText();
   }
 
  private:
   void UpdateText() {
+    if (supply_status_.is_calculating_battery_time) {
+      SetText(l10n_util::GetStringFUTF16(supply_status_.line_power_on ?
+          IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING_ON :
+          IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING_OFF,
+          base::IntToString16(
+              static_cast<int>(supply_status_.battery_percentage))));
+      return;
+    }
+
     base::TimeDelta time = base::TimeDelta::FromSeconds(
         supply_status_.line_power_on ?
         supply_status_.battery_seconds_to_full :
         supply_status_.battery_seconds_to_empty);
     int hour = time.InHours();
     int min = (time - base::TimeDelta::FromHours(hour)).InMinutes();
-    ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     if (hour || min) {
       SetText(l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_BATTERY_STATUS,
           base::IntToString16(
               static_cast<int>(supply_status_.battery_percentage)),
           base::IntToString16(hour),
           base::IntToString16(min)));
     } else {
       if (supply_status_.line_power_on) {
-        SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_BATTERY_FULL));
+        SetText(ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
+            IDS_ASH_STATUS_TRAY_BATTERY_FULL));
       } else {
         // Completely discharged? ... ha?
         SetText(string16());
       }
     }
   }
 
   PowerSupplyStatus supply_status_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPopupView);
@@ skipping 62 matching lines @@
 
 void TrayPower::OnPowerStatusChanged(const PowerSupplyStatus& status) {
   if (power_tray_.get())
     power_tray_->UpdatePowerStatus(status);
   if (power_.get())
     power_->UpdatePowerStatus(status);
 }
 
 }  // namespace internal
 }  // namespace ash