Add more descriptive labels for views in Mac's first run dialog.

chrome/browser/ui/cocoa/search_engine_dialog_controller.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/search_engine_dialog_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 178 matching lines @@
                        atIndex:(size_t)index {
   bool useImages = false;
 #if defined(GOOGLE_CHROME_BUILD)
   useImages = true;
 #endif
 
   // Make the engine identifier.
   NSView* engineIdentifier = nil;  // either the logo or the text label
 
   int logoId = engine->logo_id();
+  NSString* shortName = SysUTF16ToNSString(engine->short_name());
   if (useImages && logoId > 0) {
     NSImage* logoImage =
         ResourceBundle::GetSharedInstance().GetNativeImageNamed(logoId);
     NSRect logoBounds = NSZeroRect;
     logoBounds.size = [logoImage size];
     NSImageView* logoView =
         [[[NSImageView alloc] initWithFrame:logoBounds] autorelease];
     [logoView setImage:logoImage];
     [logoView setEditable:NO];
 
     // Tooltip text provides accessibility.
-    [logoView setToolTip:base::SysUTF16ToNSString(engine->short_name())];
+    [logoView setToolTip:shortName];
+    [logoView accessibilitySetOverrideValue:shortName
+        forAttribute:NSAccessibilityDescriptionAttribute];
     engineIdentifier = logoView;
   } else {
     // No logo -- we must show a text label.
     NSRect labelBounds = NSMakeRect(0, 0, kLogoLabelWidth, kLogoLabelHeight);
     NSTextField* labelField =
         [[[NSTextField alloc] initWithFrame:labelBounds] autorelease];
     [labelField setBezeled:NO];
     [labelField setEditable:NO];
     [labelField setSelectable:NO];
 
     scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
         [[NSMutableParagraphStyle alloc] init]);
     [paragraphStyle setAlignment:NSCenterTextAlignment];
     NSDictionary* attrs = [NSDictionary dictionaryWithObjectsAndKeys:
         [NSFont boldSystemFontOfSize:13], NSFontAttributeName,
         paragraphStyle.get(), NSParagraphStyleAttributeName,
         nil];
 
-    NSString* value = base::SysUTF16ToNSString(engine->short_name());
     scoped_nsobject<NSAttributedString> attrValue(
-        [[NSAttributedString alloc] initWithString:value
+        [[NSAttributedString alloc] initWithString:shortName
                                         attributes:attrs]);
 
     [labelField setAttributedStringValue:attrValue.get()];
 
     engineIdentifier = labelField;
   }
 
   // Make the "Choose" button.
   scoped_nsobject<NSButton> chooseButton(
       [[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 100, 34)]);
   [chooseButton setBezelStyle:NSRoundedBezelStyle];
   [[chooseButton cell] setFont:[NSFont systemFontOfSize:
       [NSFont systemFontSizeForControlSize:NSRegularControlSize]]];
   [chooseButton setTitle:l10n_util::GetNSStringWithFixup(IDS_FR_SEARCH_CHOOSE)];
   [GTMUILocalizerAndLayoutTweaker sizeToFitView:chooseButton.get()];
   [chooseButton setTag:index];
   [chooseButton setTarget:self];
   [chooseButton setAction:@selector(searchEngineSelected:)];
 
+  // Provide a more descriptive accessibility description.
+  id accElement = NSAccessibilityUnignoredDescendant(engineIdentifier);
+  [[chooseButton cell] accessibilitySetOverrideValue:accElement
+      forAttribute:NSAccessibilityTitleUIElementAttribute];
+
   // Put 'em together.
   NSRect engineIdentifierFrame = [engineIdentifier frame];
   NSRect chooseButtonFrame = [chooseButton frame];
 
   NSRect containingViewFrame = NSZeroRect;
   containingViewFrame.size.width += engineIdentifierFrame.size.width;
   containingViewFrame.size.height += engineIdentifierFrame.size.height;
   containingViewFrame.size.height += kLogoButtonSpacing;
   containingViewFrame.size.height += chooseButtonFrame.size.height;
 
@@ skipping 16 matching lines @@
 - (NSFont*)mainLabelFont {
   return [NSFont boldSystemFontOfSize:13];
 }
 
 - (IBAction)searchEngineSelected:(id)sender {
   [[self window] close];
   [NSApp stopModalWithCode:[sender tag]];
 }
 
 @end