Follow ARIA spec guidelines for role=button with aria-pressed.

content/browser/accessibility/browser_accessibility_cocoa.mm

 // Copyright (c) 2012 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.
 
 #include <execinfo.h>
 
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 
 #include <map>
 
@@ skipping 130 matching lines @@
     { ui::AX_ROLE_SVG_ROOT, NSAccessibilityGroupRole },
     { ui::AX_ROLE_SYSTEM_WIDE, NSAccessibilityUnknownRole },
     { ui::AX_ROLE_TAB, NSAccessibilityRadioButtonRole },
     { ui::AX_ROLE_TABLE, NSAccessibilityTableRole },
     { ui::AX_ROLE_TABLE_HEADER_CONTAINER, NSAccessibilityGroupRole },
     { ui::AX_ROLE_TAB_LIST, NSAccessibilityTabGroupRole },
     { ui::AX_ROLE_TAB_PANEL, NSAccessibilityGroupRole },
     { ui::AX_ROLE_TEXT_AREA, NSAccessibilityTextAreaRole },
     { ui::AX_ROLE_TEXT_FIELD, NSAccessibilityTextFieldRole },
     { ui::AX_ROLE_TIMER, NSAccessibilityGroupRole },
-    { ui::AX_ROLE_TOGGLE_BUTTON, NSAccessibilityButtonRole },
+    { ui::AX_ROLE_TOGGLE_BUTTON, NSAccessibilityCheckBoxRole },
     { ui::AX_ROLE_TOOLBAR, NSAccessibilityToolbarRole },
     { ui::AX_ROLE_TOOLTIP, NSAccessibilityGroupRole },
     { ui::AX_ROLE_TREE, NSAccessibilityOutlineRole },
     { ui::AX_ROLE_TREE_GRID, NSAccessibilityTableRole },
     { ui::AX_ROLE_TREE_ITEM, NSAccessibilityRowRole },
     { ui::AX_ROLE_VALUE_INDICATOR, NSAccessibilityValueIndicatorRole },
     { ui::AX_ROLE_WEB_AREA, @"AXWebArea" },
     { ui::AX_ROLE_WINDOW, NSAccessibilityWindowRole },
 
     // TODO(dtseng): we don't correctly support the attributes for these roles.
@@ skipping 37 matching lines @@
     { ui::AX_ROLE_NAVIGATION, @"AXLandmarkNavigation" },
     { ui::AX_ROLE_SEARCH, @"AXLandmarkSearch" },
     { ui::AX_ROLE_LOG, @"AXApplicationLog" },
     { ui::AX_ROLE_MARQUEE, @"AXApplicationMarquee" },
     { ui::AX_ROLE_MATH, @"AXDocumentMath" },
     { ui::AX_ROLE_NOTE, @"AXDocumentNote" },
     { ui::AX_ROLE_REGION, @"AXDocumentRegion" },
     { ui::AX_ROLE_STATUS, @"AXApplicationStatus" },
     { ui::AX_ROLE_TAB_PANEL, @"AXTabPanel" },
     { ui::AX_ROLE_TIMER, @"AXApplicationTimer" },
+    { ui::AX_ROLE_TOGGLE_BUTTON, @"AXToggleButton" },
     { ui::AX_ROLE_TOOLTIP, @"AXUserInterfaceTooltip" },
     { ui::AX_ROLE_TREE_ITEM, NSAccessibilityOutlineRowSubrole },
   };
 
   RoleMap subrole_map;
   for (size_t i = 0; i < arraysize(subroles); ++i)
     subrole_map[subroles[i].webKitValue] = subroles[i].nativeValue;
   return subrole_map;
 }
 
@@ skipping 437 matching lines @@
 }
 
 // Returns a string indicating the NSAccessibility role of this object.
 - (NSString*)role {
   ui::AXRole role = [self internalRole];
   if (role == ui::AX_ROLE_CANVAS &&
       browserAccessibility_->GetBoolAttribute(
           ui::AX_ATTR_CANVAS_HAS_FALLBACK)) {
     return NSAccessibilityGroupRole;
   }
+  if (role == ui::AX_ROLE_BUTTON) {
+    bool is_aria_pressed_defined;

[dmazzoni, 2014/03/06 06:09:09]

Nit: Obj-C files use camelCase for local variables.

[aboxhall, 2014/03/06 17:45:58]

Done.

+    bool is_mixed;
+    browserAccessibility_->GetAriaTristate("aria-pressed",
+                                           &is_aria_pressed_defined,
+                                           &is_mixed);
+    if (is_aria_pressed_defined)
+      return NSAccessibilityCheckBoxRole;
+    else
+      return NSAccessibilityButtonRole;
+  }
   return NativeRoleFromAXRole(role);
 }
 
 // Returns a string indicating the role description of this object.
 - (NSString*)roleDescription {
   NSString* role = [self role];
 
   ContentClient* content_client = content::GetContentClient();
 
   // The following descriptions are specific to webkit.
@@ skipping 27 matching lines @@
   }
 
   switch([self internalRole]) {
   case ui::AX_ROLE_FOOTER:
     return base::SysUTF16ToNSString(content_client->GetLocalizedString(
         IDS_AX_ROLE_FOOTER));
   case ui::AX_ROLE_SPIN_BUTTON:
     // This control is similar to what VoiceOver calls a "stepper".
     return base::SysUTF16ToNSString(content_client->GetLocalizedString(
         IDS_AX_ROLE_STEPPER));
+  case ui::AX_ROLE_TOGGLE_BUTTON:
+    return base::SysUTF16ToNSString(content_client->GetLocalizedString(
+        IDS_AX_ROLE_TOGGLE_BUTTON));
   default:
     break;
   }
 
   return NSAccessibilityRoleDescription(role, nil);
 }
 
 - (NSArray*)rowHeaders {
   if ([self internalRole] != ui::AX_ROLE_TABLE &&
       [self internalRole] != ui::AX_ROLE_GRID) {
@@ skipping 146 matching lines @@
     value = GetState(
         browserAccessibility_, ui::AX_STATE_SELECTED) ?
             1 :
             value;
 
     if (browserAccessibility_->GetBoolAttribute(
         ui::AX_ATTR_BUTTON_MIXED)) {
       value = 2;
     }
     return [NSNumber numberWithInt:value];
+  } else if ([self internalRole] == ui::AX_ROLE_TOGGLE_BUTTON) {
+    int value = 0;
+    bool aria_pressed_defined;
+    bool aria_pressed_mixed;
+    value = browserAccessibility_->GetAriaTristate(
+        "aria-pressed", &aria_pressed_defined, &aria_pressed_mixed) ? 1 : 0;
+
+    if (aria_pressed_mixed)
+      value = 2;
+
+    return [NSNumber numberWithInt:value];
+
   } else if ([role isEqualToString:NSAccessibilityProgressIndicatorRole] ||
              [role isEqualToString:NSAccessibilitySliderRole] ||
              [role isEqualToString:NSAccessibilityScrollBarRole]) {
     float floatValue;
     if (browserAccessibility_->GetFloatAttribute(
             ui::AX_ATTR_VALUE_FOR_RANGE, &floatValue)) {
       return [NSNumber numberWithFloat:floatValue];
     }
   } else if ([role isEqualToString:NSAccessibilityColorWellRole]) {
     int r = browserAccessibility_->GetIntAttribute(
@@ skipping 583 matching lines @@
     return [super hash];
   return browserAccessibility_->renderer_id();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end