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

ash/system/tray/system_tray.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/tray/system_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
@@ skipping 33 matching lines @@
 #include "ui/views/view.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/audio/tray_audio_chromeos.h"
 #include "ash/system/chromeos/brightness/tray_brightness.h"
 #include "ash/system/chromeos/enterprise/tray_enterprise.h"
 #include "ash/system/chromeos/managed/tray_locally_managed_user.h"
 #include "ash/system/chromeos/network/tray_network.h"
 #include "ash/system/chromeos/network/tray_sms.h"
 #include "ash/system/chromeos/network/tray_vpn.h"
+#include "ash/system/chromeos/power/power_status.h"
 #include "ash/system/chromeos/power/tray_power.h"
 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h"
 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h"
 #include "ash/system/chromeos/session/tray_session_length_limit.h"
 #include "ash/system/chromeos/settings/tray_settings.h"
 #include "ash/system/chromeos/tray_caps_lock.h"
 #include "ash/system/chromeos/tray_display.h"
 #include "ash/system/chromeos/tray_tracing.h"
 #include "ash/system/tray/media_security/multi_profile_media_tray_item.h"
@@ skipping 331 matching lines @@
   UpdateWebNotifications();
 }
 
 void SystemTray::DestroyNotificationBubble() {
   if (notification_bubble_) {
     notification_bubble_.reset();
     UpdateWebNotifications();
   }
 }
 
+base::string16 SystemTray::GetAccessibleNameForTray() {
+  base::string16 time = GetAccessibleTimeString(base::Time::Now());
+  base::string16 battery = base::ASCIIToUTF16("");
+#if defined(OS_CHROMEOS)
+  battery = PowerStatus::Get()->GetAccessibleNameString(false);
+#endif
+  return l10n_util::GetStringFUTF16(
+      IDS_ASH_STATUS_TRAY_ACCESSIBLE_DESCRIPTION, time, battery);
+}
+
 int SystemTray::GetTrayXOffset(SystemTrayItem* item) const {
   // Don't attempt to align the arrow if the shelf is on the left or right.
   if (shelf_alignment() != SHELF_ALIGNMENT_BOTTOM &&
       shelf_alignment() != SHELF_ALIGNMENT_TOP)
     return TrayBubbleView::InitParams::kArrowDefaultOffset;
 
   std::map<SystemTrayItem*, views::View*>::const_iterator it =
       tray_item_map_.find(item);
   if (it == tray_item_map_.end())
     return TrayBubbleView::InitParams::kArrowDefaultOffset;
@@ skipping 166 matching lines @@
       height = std::max(
           0, work_area.height() - bubble_view->GetBoundsInScreen().y());
     } else {
       height = std::max(
           0, bubble_view->GetBoundsInScreen().bottom() - work_area.y());
     }
   }
   status_area_widget()->web_notification_tray()->SetSystemTrayHeight(height);
 }
 
+base::string16 SystemTray::GetAccessibleTimeString(
+    const base::Time& now) const {
+  base::HourClockType hour_type =
+      ash::Shell::GetInstance()->system_tray_delegate()->GetHourClockType();
+  return base::TimeFormatTimeOfDayWithHourClockType(
+      now, hour_type, base::kKeepAmPm);
+}
+
 void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
   TrayBackgroundView::SetShelfAlignment(alignment);
   UpdateAfterShelfAlignmentChange(alignment);
   // Destroy any existing bubble so that it is rebuilt correctly.
   CloseSystemBubbleAndDeactivateSystemTray();
   // Rebuild any notification bubble.
   if (notification_bubble_) {
     notification_bubble_.reset();
     UpdateNotificationBubble();
   }
 }
 
 void SystemTray::AnchorUpdated() {
   if (notification_bubble_) {
     notification_bubble_->bubble_view()->UpdateBubble();
     // Ensure that the notification buble is above the shelf/status area.
     notification_bubble_->bubble_view()->GetWidget()->StackAtTop();
     UpdateBubbleViewArrow(notification_bubble_->bubble_view());
   }
   if (system_bubble_) {
     system_bubble_->bubble_view()->UpdateBubble();
     UpdateBubbleViewArrow(system_bubble_->bubble_view());
   }
 }
 
-base::string16 SystemTray::GetAccessibleNameForTray() {
-  return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME);
-}
-
 void SystemTray::BubbleResized(const TrayBubbleView* bubble_view) {
   UpdateWebNotifications();
 }
 
 void SystemTray::HideBubbleWithView(const TrayBubbleView* bubble_view) {
   if (system_bubble_.get() && bubble_view == system_bubble_->bubble_view()) {
     DestroySystemBubble();
     UpdateNotificationBubble();  // State changed, re-create notifications.
     GetShelfLayoutManager()->UpdateAutoHideState();
   } else if (notification_bubble_.get() &&
@@ skipping 75 matching lines @@
   system_bubble_.reset();
   // When closing a system bubble with the alternate shelf layout, we need to
   // turn off the active tinting of the shelf.
   if (full_system_tray_menu_) {
     SetDrawBackgroundAsActive(false);
     full_system_tray_menu_ = false;
   }
 }
 
 }  // namespace ash