Tagging a whole bunch of buttons with descriptions (via code; OS bug prevents us from doing it via nib).

BUG=http://crbug.com/28286
TEST=As in bug

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

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

2 files changed, 45 insertions, 0 deletions

diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 375532d..c3fee91 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -331,6 +331,12 @@ private:
                owner:self
             userInfo:nil]);
     [tabStripView_ addTrackingArea:trackingArea_.get()];
+
+    // Set accessibility descriptions. http://openradar.appspot.com/7496255
+    NSString* description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_NEWTAB);
+    [[newTabButton_ cell]
+        accessibilitySetOverrideValue:description
+                         forAttribute:NSAccessibilityDescriptionAttribute];
   }
   return self;
 }
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index 93ec18a..cab30d6 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -36,6 +36,7 @@
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
+#include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace {
@@ -258,6 +259,44 @@ class PrefObserverBridge : public NotificationObserver {
   // We want a dynamic tooltip on the go button, so tell the go button to ask
   // use for the tooltip
   [goButton_ addToolTipRect:[goButton_ bounds] owner:self userData:nil];
+
+  // Set accessibility descriptions. http://openradar.appspot.com/7496255
+  NSString* description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_BACK);
+  [[backButton_ cell]
+      accessibilitySetOverrideValue:description
+                       forAttribute:NSAccessibilityDescriptionAttribute];
+  description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_FORWARD);
+  [[forwardButton_ cell]
+      accessibilitySetOverrideValue:description
+                       forAttribute:NSAccessibilityDescriptionAttribute];
+  description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_RELOAD);
+  [[reloadButton_ cell]
+      accessibilitySetOverrideValue:description
+                       forAttribute:NSAccessibilityDescriptionAttribute];
+  description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_HOME);
+  [[homeButton_ cell]
+      accessibilitySetOverrideValue:description
+                       forAttribute:NSAccessibilityDescriptionAttribute];
+  description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_STAR);
+  [[starButton_ cell]
+      accessibilitySetOverrideValue:description
+                       forAttribute:NSAccessibilityDescriptionAttribute];
+  description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_LOCATION);
+  [[locationBar_ cell]
+      accessibilitySetOverrideValue:description
+                       forAttribute:NSAccessibilityDescriptionAttribute];
+  description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_GO);
+  [[goButton_ cell]
+      accessibilitySetOverrideValue:description
+                       forAttribute:NSAccessibilityDescriptionAttribute];
+  description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_PAGE);
+  [[pageButton_ cell]
+      accessibilitySetOverrideValue:description
+                       forAttribute:NSAccessibilityDescriptionAttribute];
+  description = l10n_util::GetNSStringWithFixup(IDS_ACCNAME_APP);
+  [[wrenchButton_ cell]
+      accessibilitySetOverrideValue:description
+                       forAttribute:NSAccessibilityDescriptionAttribute];
 }
 
 - (void)mouseExited:(NSEvent*)theEvent {