summaryrefslogtreecommitdiffstats
path: root/ash/system/settings
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 04:11:06 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-23 04:11:06 +0000
commit65cd7365fd60ab2d2285645cf96c133142524fe4 (patch)
tree5b7f56af2356e80db659b4052a59a01e0eb2462f /ash/system/settings
parenta4b5abdd9e197576c9765542ede63f6234bf8a9c (diff)
downloadchromium_src-65cd7365fd60ab2d2285645cf96c133142524fe4.zip
chromium_src-65cd7365fd60ab2d2285645cf96c133142524fe4.tar.gz
chromium_src-65cd7365fd60ab2d2285645cf96c133142524fe4.tar.bz2
Add an accessible name to the restart button
R=hashimoto@chromium.org BUG=chromium-os:29383 TEST=See bug Review URL: http://codereview.chromium.org/10078009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/settings')
-rw-r--r--ash/system/settings/tray_settings.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc
index 9039fa8..bd67ab7 100644
--- a/ash/system/settings/tray_settings.cc
+++ b/ash/system/settings/tray_settings.cc
@@ -37,9 +37,12 @@ class SettingsView : public ash::internal::ActionableView {
icon->SetImage(rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToSkBitmap());
AddChildView(icon);
- label_ = new views::Label(rb.GetLocalizedString(
- IDS_ASH_STATUS_TRAY_SETTINGS_AND_HELP));
+ string16 text = rb.GetLocalizedString(
+ IDS_ASH_STATUS_TRAY_SETTINGS_AND_HELP);
+ label_ = new views::Label(text);
AddChildView(label_);
+
+ SetAccessibleName(text);
}
virtual ~SettingsView() {}
@@ -50,14 +53,6 @@ class SettingsView : public ash::internal::ActionableView {
return true;
}
- // Overridden from views::View.
- void GetAccessibleState(ui::AccessibleViewState* state) {
- state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- state->name = rb.GetLocalizedString(
- IDS_ASH_STATUS_TRAY_SETTINGS_AND_HELP);
- }
-
private:
views::Label* label_;