Index: ash/system/tray/system_tray.cc |
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc |
index 5c6af2ce30da634886aa8cbdad624d3e1522a86f..640a3db424c145694db3f0226593e49940531055 100644 |
--- a/ash/system/tray/system_tray.cc |
+++ b/ash/system/tray/system_tray.cc |
@@ -588,6 +588,14 @@ void SystemTray::UpdateWebNotifications() { |
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; |
@@ -616,7 +624,10 @@ void SystemTray::AnchorUpdated() { |
} |
base::string16 SystemTray::GetAccessibleNameForTray() { |
- return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME); |
+ base::string16 time = GetAccessibleTimeString(base::Time::Now()); |
+ base::string16 battery = PowerStatus::Get()->GetShortAccessibleNameString(); |
+ return l10n_util::GetStringFUTF16( |
+ IDS_ASH_STATUS_TRAY_ACCESSIBLE_DESCRIPTION, time, battery); |
} |
void SystemTray::BubbleResized(const TrayBubbleView* bubble_view) { |