Added battery level and time to the status tray's accessible name.

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 217 matching lines @@
         GetBatteryPercent() / 100.0 * (kNumPowerImages - 1));
     index = std::max(std::min(index, kNumPowerImages - 2), 0);
   }
 
   gfx::Rect region(
       offset * kBatteryImageWidth, index * kBatteryImageHeight,
       kBatteryImageWidth, kBatteryImageHeight);
   return gfx::ImageSkiaOperations::ExtractSubset(*all.ToImageSkia(), region);
 }
 
-base::string16 PowerStatus::GetAccessibleNameString() const {
+base::string16 PowerStatus::GetAccessibleNameString(
+    bool full_description) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (IsBatteryFull()) {
     return rb.GetLocalizedString(
         IDS_ASH_STATUS_TRAY_BATTERY_FULL_CHARGE_ACCESSIBLE);
   }
 
   base::string16 battery_percentage_accessible = l10n_util::GetStringFUTF16(
       IsBatteryCharging() ?
       IDS_ASH_STATUS_TRAY_BATTERY_PERCENT_CHARGING_ACCESSIBLE :
       IDS_ASH_STATUS_TRAY_BATTERY_PERCENT_ACCESSIBLE,
       base::IntToString16(GetRoundedBatteryPercent()));
+  if (!full_description)
+    return battery_percentage_accessible;
+
   base::string16 battery_time_accessible = base::string16();
   const base::TimeDelta time = IsBatteryCharging() ? GetBatteryTimeToFull() :
       GetBatteryTimeToEmpty();
 
   if (IsUsbChargerConnected()) {
     battery_time_accessible = rb.GetLocalizedString(
         IDS_ASH_STATUS_TRAY_BATTERY_CHARGING_UNRELIABLE_ACCESSIBLE);
   } else if (IsBatteryTimeBeingCalculated()) {
     battery_time_accessible = rb.GetLocalizedString(
         IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING_ACCESSIBLE);
@@ skipping 36 matching lines @@
 }
 
 void PowerStatus::PowerChanged(
     const power_manager::PowerSupplyProperties& proto) {
   proto_ = proto;
   SanitizeProto(&proto_);
   FOR_EACH_OBSERVER(Observer, observers_, OnPowerStatusChanged());
 }
 
 }  // namespace ash