Set proper accessible names on the network and battery icons

BUG=85116
TEST=Manual


Review URL: http://codereview.chromium.org/7147012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89134 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 22 insertions, 15 deletions

diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc
index 2cdbf74..e517a46 100644
--- a/chrome/browser/chromeos/status/network_menu_button.cc
+++ b/chrome/browser/chromeos/status/network_menu_button.cc
@@ -332,8 +332,8 @@ void NetworkMenuButton::SetNetworkIcon(NetworkLibrary* cros,
     SetIconAndBadges(rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0),
                      rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_WARNING),
                      NULL);
-    SetTooltipText(UTF16ToWide(l10n_util::GetStringUTF16(
-        IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP)));
+    SetTooltipAndAccessibleName(
+        l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP));
     return;
   }
 
@@ -348,8 +348,8 @@ void NetworkMenuButton::SetNetworkIcon(NetworkLibrary* cros,
           rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED),
           NULL);
     }
-    SetTooltipText(UTF16ToWide(l10n_util::GetStringUTF16(
-        IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP)));
+    SetTooltipAndAccessibleName(
+        l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP));
     return;
   }
 
@@ -371,10 +371,10 @@ void NetworkMenuButton::SetNetworkIcon(NetworkLibrary* cros,
       wireless = cros->cellular_network();
       SetBadgesOnly(BadgeForNetworkTechnology(cros->cellular_network()), NULL);
     }
-    SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16(
+    SetTooltipAndAccessibleName(l10n_util::GetStringFUTF16(
         wireless->configuring() ? IDS_STATUSBAR_NETWORK_CONFIGURING_TOOLTIP
                                 : IDS_STATUSBAR_NETWORK_CONNECTING_TOOLTIP,
-        UTF8ToUTF16(wireless->name()))));
+        UTF8ToUTF16(wireless->name())));
   } else {
     // Stop connecting animation since we are not connecting.
     animation_connecting_.Stop();
@@ -387,26 +387,25 @@ void NetworkMenuButton::SetNetworkIcon(NetworkLibrary* cros,
       if (network->type() == TYPE_ETHERNET) {
         SetIconAndBadges(rb.GetBitmapNamed(IDR_STATUSBAR_WIRED),
                          right_badge, left_badge);
-        SetTooltipText(
-            UTF16ToWide(l10n_util::GetStringFUTF16(
-                IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-                l10n_util::GetStringUTF16(
-                    IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET))));
+        SetTooltipAndAccessibleName(l10n_util::GetStringFUTF16(
+            IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
+            l10n_util::GetStringUTF16(
+                IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET)));
       } else if (network->type() == TYPE_WIFI) {
         const WifiNetwork* wifi = static_cast<const WifiNetwork*>(network);
         SetIconAndBadges(IconForNetworkStrength(wifi), right_badge, left_badge);
-        SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16(
+        SetTooltipAndAccessibleName(l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToUTF16(wifi->name()))));
+            UTF8ToUTF16(wifi->name())));
       } else if (network->type() == TYPE_CELLULAR) {
         const CellularNetwork* cellular =
             static_cast<const CellularNetwork*>(network);
         right_badge = BadgeForNetworkTechnology(cellular);
         SetIconAndBadges(
             IconForNetworkStrength(cellular), right_badge, left_badge);
-        SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16(
+        SetTooltipAndAccessibleName(l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToUTF16(cellular->name()))));
+            UTF8ToUTF16(cellular->name())));
       }
     }
   }
@@ -522,4 +521,9 @@ void NetworkMenuButton::ShowOptionalMobileDataPromoNotification(
   }
 }
 
+void NetworkMenuButton::SetTooltipAndAccessibleName(const string16& label) {
+  SetTooltipText(UTF16ToWide(label));
+  SetAccessibleName(label);
+}
+
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/status/network_menu_button.h b/chrome/browser/chromeos/status/network_menu_button.h
index e852bc3..967f9cd9 100644
--- a/chrome/browser/chromeos/status/network_menu_button.h
+++ b/chrome/browser/chromeos/status/network_menu_button.h
@@ -125,6 +125,8 @@ class NetworkMenuButton : public StatusAreaButton,
   // Shows 3G promo notification if needed.
   void ShowOptionalMobileDataPromoNotification(NetworkLibrary* cros);
 
+  void SetTooltipAndAccessibleName(const string16& label);
+
   // Path of the Cellular device that we monitor property updates from.
   std::string cellular_device_path_;
 
diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc
index 1e9bbda..04ec6b3 100644
--- a/chrome/browser/chromeos/status/power_menu_button.cc
+++ b/chrome/browser/chromeos/status/power_menu_button.cc
@@ -240,6 +240,7 @@ void PowerMenuButton::UpdateIconAndLabelInfo() {
 
   SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(icon_id_));
   SetTooltipText(GetLabel(POWER_BATTERY_PERCENTAGE_ITEM));
+  SetAccessibleName(GetBatteryPercentageText());
   UpdateMenu();
   SchedulePaint();
 }