Add accessible names to buttons in the Uber tray

BUG=140163


Review URL: https://chromiumcodereview.appspot.com/10837067

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

ash/system/bluetooth/tray_bluetooth.cc

@@ -99,7 +99,8 @@ class BluetoothDetailedView : public TrayDetailsView,
         IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED,
         IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED,
         IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER,
-        IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER);
+        IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER,
+        IDS_ASH_STATUS_TRAY_BLUETOOTH);
     toggle_bluetooth_->SetToggled(!delegate->GetBluetoothEnabled());
     footer()->AddButton(toggle_bluetooth_);
   }

ash/system/date/tray_date.cc

@@ -16,6 +16,7 @@
 #include "base/time.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
+#include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -69,7 +70,8 @@ class DateDefaultView : public views::View,
         IDR_AURA_UBER_TRAY_HELP,
         IDR_AURA_UBER_TRAY_HELP,
         IDR_AURA_UBER_TRAY_HELP_HOVER,
-        IDR_AURA_UBER_TRAY_HELP_HOVER);
+        IDR_AURA_UBER_TRAY_HELP_HOVER,
+        IDS_ASH_STATUS_TRAY_HELP);
     view->AddButton(help_);
 
     if (login != ash::user::LOGGED_IN_LOCKED &&
@@ -78,7 +80,8 @@ class DateDefaultView : public views::View,
           IDR_AURA_UBER_TRAY_SHUTDOWN,
           IDR_AURA_UBER_TRAY_SHUTDOWN,
           IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER,
-          IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER);
+          IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER,
+          IDS_ASH_STATUS_TRAY_SHUTDOWN);
       view->AddButton(shutdown_);
 
       if (login != ash::user::LOGGED_IN_GUEST) {
@@ -86,7 +89,8 @@ class DateDefaultView : public views::View,
             IDR_AURA_UBER_TRAY_LOCKSCREEN,
             IDR_AURA_UBER_TRAY_LOCKSCREEN,
             IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER,
-            IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER);
+            IDR_AURA_UBER_TRAY_LOCKSCREEN_HOVER,
+            IDS_ASH_STATUS_TRAY_LOCK);
         view->AddButton(lock_);
       }
     }

ash/system/network/tray_network.cc

@@ -265,21 +265,24 @@ class NetworkDetailedView : public TrayDetailsView,
         IDR_AURA_UBER_TRAY_WIFI_ENABLED,
         IDR_AURA_UBER_TRAY_WIFI_DISABLED,
         IDR_AURA_UBER_TRAY_WIFI_ENABLED_HOVER,
-        IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER);
+        IDR_AURA_UBER_TRAY_WIFI_DISABLED_HOVER,
+        IDS_ASH_STATUS_TRAY_WIFI);
     footer()->AddButton(button_wifi_);
 
     button_mobile_ = new TrayPopupHeaderButton(this,
         IDR_AURA_UBER_TRAY_CELLULAR_ENABLED,
         IDR_AURA_UBER_TRAY_CELLULAR_DISABLED,
         IDR_AURA_UBER_TRAY_CELLULAR_ENABLED_HOVER,
-        IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER);
+        IDR_AURA_UBER_TRAY_CELLULAR_DISABLED_HOVER,
+        IDS_ASH_STATUS_TRAY_CELLULAR);
     footer()->AddButton(button_mobile_);
 
     info_icon_ = new TrayPopupHeaderButton(this,
         IDR_AURA_UBER_TRAY_NETWORK_INFO,
         IDR_AURA_UBER_TRAY_NETWORK_INFO,
         IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER,
-        IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER);
+        IDR_AURA_UBER_TRAY_NETWORK_INFO_HOVER,
+        IDS_ASH_STATUS_TRAY_NETWORK_INFO);
     footer()->AddButton(info_icon_);
   }
 

ash/system/tray/tray_views.cc

@@ -404,7 +404,8 @@ TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
                                              int enabled_resource_id,
                                              int disabled_resource_id,
                                              int enabled_resource_id_hover,
-                                             int disabled_resource_id_hover)
+                                             int disabled_resource_id_hover,
+                                             int accessible_name_id)
     : views::ToggleImageButton(listener) {
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   SetImage(views::CustomButton::BS_NORMAL,
@@ -417,6 +418,7 @@ TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
       bundle.GetImageNamed(disabled_resource_id_hover).ToImageSkia());
   SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                     views::ImageButton::ALIGN_MIDDLE);
+  SetAccessibleName(bundle.GetLocalizedString(accessible_name_id));
   set_focusable(true);
   set_request_focus_on_press(false);
 }

ash/system/tray/tray_views.h

@@ -218,7 +218,8 @@ class TrayPopupHeaderButton : public views::ToggleImageButton {
                         int enabled_resource_id,
                         int disabled_resource_id,
                         int enabled_resource_id_hover,
-                        int disabled_resource_id_hover);
+                        int disabled_resource_id_hover,
+                        int accessible_name_id);
   virtual ~TrayPopupHeaderButton();
 
  private: