Mac: Fix tab view accessibility.

chrome/browser/ui/cocoa/tabs/tab_strip_view.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.
 
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 
 #include <cmath>  // floor
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 209 matching lines @@
 
 // (URLDropTarget protocol)
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
   return [dropHandler_ performDragOperation:sender];
 }
 
 - (BOOL)accessibilityIsIgnored {
   return NO;
 }
 
+// Returns AX children (tabs and new tab button), sorted from left to right.
+- (NSArray*)accessibilityChildren {
+  NSArray* children =
+      [super accessibilityAttributeValue:NSAccessibilityChildrenAttribute];
+  return [children sortedArrayUsingComparator:
+      ^NSComparisonResult(id first, id second) {
+          NSPoint firstPosition =
+              [[first accessibilityAttributeValue:
+                          NSAccessibilityPositionAttribute] pointValue];
+          NSPoint secondPosition =
+              [[second accessibilityAttributeValue:
+                           NSAccessibilityPositionAttribute] pointValue];
+          if (firstPosition.x < secondPosition.x)
+            return NSOrderedAscending;
+          else if (firstPosition.x > secondPosition.x)
+            return NSOrderedDescending;
+          else
+            return NSOrderedSame;
+      }];
+}
+
 - (id)accessibilityAttributeValue:(NSString*)attribute {
-  if ([attribute isEqual:NSAccessibilityRoleAttribute])
+  if ([attribute isEqual:NSAccessibilityRoleAttribute]) {
     return NSAccessibilityTabGroupRole;
-  if ([attribute isEqual:NSAccessibilityTabsAttribute]) {
-    NSMutableArray* tabs = [[[NSMutableArray alloc] init] autorelease];
-    NSArray* children =
-        [self accessibilityAttributeValue:NSAccessibilityChildrenAttribute];
-    for (id child in children) {
-      if ([[child accessibilityAttributeValue:NSAccessibilityRoleAttribute]
-          isEqual:NSAccessibilityRadioButtonRole]) {
-        [tabs addObject:child];
-      }
-    }
-    return tabs;
+  } else if ([attribute isEqual:NSAccessibilityChildrenAttribute]) {
+    return [self accessibilityChildren];
+  } else if ([attribute isEqual:NSAccessibilityTabsAttribute]) {
+    NSArray* children = [self accessibilityChildren];
+    NSIndexSet* indexes = [children indexesOfObjectsPassingTest:
+        ^BOOL(id child, NSUInteger idx, BOOL* stop) {
+            NSString* role = [child
+                accessibilityAttributeValue:NSAccessibilityRoleAttribute];
+            return [role isEqualToString:NSAccessibilityRadioButtonRole];
+        }];
+    return [children objectsAtIndexes:indexes];
+  } else if ([attribute isEqual:NSAccessibilityContentsAttribute]) {
+    return [self accessibilityChildren];
+  } else if ([attribute isEqual:NSAccessibilityValueAttribute]) {
+    return [controller_ activeTabView];
   }
-  if ([attribute isEqual:NSAccessibilityContentsAttribute])
-    return [self accessibilityAttributeValue:NSAccessibilityChildrenAttribute];
-  if ([attribute isEqual:NSAccessibilityValueAttribute])
-    return [controller_ activeTabView];
 
   return [super accessibilityAttributeValue:attribute];
 }
 
 - (NSArray*)accessibilityAttributeNames {
   NSMutableArray* attributes =
       [[super accessibilityAttributeNames] mutableCopy];
   [attributes addObject:NSAccessibilityTabsAttribute];
   [attributes addObject:NSAccessibilityContentsAttribute];
   [attributes addObject:NSAccessibilityValueAttribute];
@@ skipping 11 matching lines @@
 
 - (void)setNewTabButton:(NewTabButton*)button {
   newTabButton_.reset([button retain]);
 }
 
 - (void)setController:(TabStripController*)controller {
   controller_ = controller;
 }
 
 @end