[Mac] Add accessibility features to the new avatar menu

chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm

 // Copyright 2014 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/profiles/avatar_button_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "components/signin/core/browser/signin_error_controller.h"
+#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #import "ui/base/cocoa/appkit_utils.h"
 #import "ui/base/cocoa/hover_image_button.h"
+#include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/nine_image_painter_factory.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 namespace {
 
 const CGFloat kButtonPadding = 12;
 const CGFloat kButtonDefaultPadding = 5;
 const CGFloat kButtonHeight = 27;
@@ skipping 15 matching lines @@
 
 }  // namespace
 
 // Button cell with a custom border given by a set of nine-patch image grids.
 @interface CustomThemeButtonCell : NSButtonCell {
  @private
    BOOL isThemedWindow_;
    base::scoped_nsobject<NSImage> authenticationErrorImage_;
 }
 - (void)setIsThemedWindow:(BOOL)isThemedWindow;
-- (void)setHasError:(BOOL)hasError;
+- (void)setHasError:(BOOL)hasError withTitle:(NSString*)title;
 
 @end
 
 @implementation CustomThemeButtonCell
 - (id)initWithThemedWindow:(BOOL)isThemedWindow {
   if ((self = [super init])) {
     isThemedWindow_ = isThemedWindow;
     authenticationErrorImage_.reset();
   }
   return self;
@@ skipping 59 matching lines @@
     imageIds = kPressedBorderImageIds;
   else if (hoverState == kHoverStateMouseOver)
     imageIds = kHoverBorderImageIds;
   ui::DrawNinePartImage(frame, imageIds, NSCompositeSourceOver, 1.0, true);
 }
 
 - (void)setIsThemedWindow:(BOOL)isThemedWindow {
   isThemedWindow_ = isThemedWindow;
 }
 
-- (void)setHasError:(BOOL)hasError {
+- (void)setHasError:(BOOL)hasError withTitle:(NSString*)title {
   if (hasError) {
     authenticationErrorImage_.reset(
         [ui::ResourceBundle::GetSharedInstance().GetImageNamed(
             IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR).ToNSImage() retain]);
+    [self accessibilitySetOverrideValue:l10n_util::GetNSStringF(
+        IDS_PROFILES_ACCOUNT_BUTTON_AUTH_ERROR_ACCESSIBLE_NAME,
+        base::SysNSStringToUTF16(title))
+                           forAttribute:NSAccessibilityTitleAttribute];
   } else {
     authenticationErrorImage_.reset();
+    [self accessibilitySetOverrideValue:title
+                          forAttribute:NSAccessibilityTitleAttribute];
   }
 }
 
 @end
 
 @interface AvatarButtonController (Private)
 - (void)updateAvatarButtonAndLayoutParent:(BOOL)layoutParent;
 - (void)updateErrorStatus:(BOOL)hasError;
 - (void)dealloc;
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
@@ skipping 14 matching lines @@
     [hoverButton setHoverImage:GetImageFromResourceID(
         IDR_AVATAR_MAC_BUTTON_DROPARROW_HOVER)];
     [hoverButton setPressedImage:GetImageFromResourceID(
         IDR_AVATAR_MAC_BUTTON_DROPARROW_PRESSED)];
 
     button_.reset(hoverButton);
     base::scoped_nsobject<CustomThemeButtonCell> cell(
         [[CustomThemeButtonCell alloc] initWithThemedWindow:isThemedWindow_]);
     SigninErrorController* errorController =
         profiles::GetSigninErrorController(browser->profile());
-    if (errorController)
-      [cell setHasError:errorController->HasError()];
+
     [button_ setCell:cell.get()];
     [self setView:button_];
 
     [button_ setBezelStyle:NSShadowlessSquareBezelStyle];
     [button_ setButtonType:NSMomentaryChangeButton];
     [button_ setBordered:YES];
     // This is a workaround for an issue in the HoverImageButton where the
     // button is initially sized incorrectly unless a default image is provided.
     [button_ setImage:GetImageFromResourceID(IDR_AVATAR_MAC_BUTTON_DROPARROW)];
     [button_ setImagePosition:NSImageRight];
     [button_ setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
     [button_ setTarget:self];
     [button_ setAction:@selector(buttonClicked:)];
 
     [self updateAvatarButtonAndLayoutParent:NO];
+    if (errorController)
+      [cell setHasError:errorController->HasError() withTitle:[button_ title]];
 
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(themeDidChangeNotification:)
                    name:kBrowserThemeDidChangeNotification
                  object:nil];
   }
   return self;
 }
 
@@ skipping 53 matching lines @@
   if (layoutParent) {
     // Because the width of the button might have changed, the parent browser
     // frame needs to recalculate the button bounds and redraw it.
     [[BrowserWindowController
         browserWindowControllerForWindow:browser_->window()->GetNativeWindow()]
         layoutSubviews];
   }
 }
 
 - (void)updateErrorStatus:(BOOL)hasError {
-  [[button_ cell] setHasError:hasError];
+  [[button_ cell] setHasError:hasError withTitle:[button_ title]];
   [self updateAvatarButtonAndLayoutParent:YES];
 }
 
 @end