[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.h"

[groby-ooo-7-16, 2014/08/15 00:38:35]

Do you need this?

[noms (inactive), 2014/08/15 19:26:47]

Done.

+#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 110 matching lines @@
   } else {
     authenticationErrorImage_.reset();
   }
 }
 
 @end
 
 @interface AvatarButtonController (Private)
 - (void)updateAvatarButtonAndLayoutParent:(BOOL)layoutParent;
 - (void)updateErrorStatus:(BOOL)hasError;
+- (void)updateAccessibilityValue:(BOOL)hasError;
 - (void)dealloc;
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
 @end
 
 @implementation AvatarButtonController
 
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super initWithBrowser:browser])) {
     ThemeService* themeService =
         ThemeServiceFactory::GetForProfile(browser->profile());
@@ skipping 23 matching lines @@
     [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];
+    [self updateAccessibilityValue:
+        errorController && errorController->HasError()];
 
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(themeDidChangeNotification:)
                    name:kBrowserThemeDidChangeNotification
                  object:nil];
   }
   return self;
 }
 
@@ skipping 55 matching lines @@
     // frame needs to recalculate the button bounds and redraw it.
     [[BrowserWindowController
         browserWindowControllerForWindow:browser_->window()->GetNativeWindow()]
         layoutSubviews];
   }
 }
 
 - (void)updateErrorStatus:(BOOL)hasError {
   [[button_ cell] setHasError:hasError];
   [self updateAvatarButtonAndLayoutParent:YES];
+  [self updateAccessibilityValue:hasError];
+}
+
+- (void)updateAccessibilityValue:(BOOL)hasError {

[groby-ooo-7-16, 2014/08/15 00:38:35]

That's a horrible name, sorry. How about setAccessibleAccountButtonTitle, or
something that makes clear _what_ value to set?

[noms (inactive), 2014/08/15 19:26:47]

Acknowledged.

+  base::string16 buttonTitle = base::SysNSStringToUTF16([button_ title]);

[groby-ooo-7-16, 2014/08/15 00:38:35]

Silly question - why get this outside the if(), since that's the only place it's
used?

[noms (inactive), 2014/08/15 19:26:47]

No good reason

On 2014/08/15 00:38:35, groby wrote:

+  if (hasError) {
+    [[button_ cell]
+        accessibilitySetOverrideValue:l10n_util::GetNSStringF(

[groby-ooo-7-16, 2014/08/15 00:38:35]

Why not do all this magic in the cell - that way it's guaranteed to happen when
you change the error status?

[noms (inactive), 2014/08/15 19:26:47]

Hmm, because the cell didn't have the title but that was not actually a thing.
Done!

On 2014/08/15 00:38:35, groby wrote:

+            IDS_PROFILES_ACCOUNT_BUTTON_AUTH_ERROR_ACCESSIBLE_NAME, buttonTitle)
+                         forAttribute:NSAccessibilityTitleAttribute];
+  } else {
+    [[button_ cell]
+        accessibilitySetOverrideValue:[button_ title]
+                         forAttribute:NSAccessibilityTitleAttribute];
+  }
 }
 
 @end