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..3e6140e7786ad0ff3f10cb4644acc8db97de27f8 100644 |
--- a/ash/system/tray/system_tray.cc |
+++ b/ash/system/tray/system_tray.cc |
@@ -402,6 +402,13 @@ void SystemTray::DestroyNotificationBubble() { |
} |
} |
+base::string16 SystemTray::GetAccessibleNameForTray() { |
+ base::string16 time = GetAccessibleTimeString(base::Time::Now()); |
+ base::string16 battery = PowerStatus::Get()->GetAccessibleNameString(false); |
+ 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 && |
@@ -588,6 +595,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; |
@@ -615,10 +630,6 @@ void SystemTray::AnchorUpdated() { |
} |
} |
-base::string16 SystemTray::GetAccessibleNameForTray() { |
- return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME); |
-} |
- |
void SystemTray::BubbleResized(const TrayBubbleView* bubble_view) { |
UpdateWebNotifications(); |
} |