Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: content/browser/accessibility/browser_accessibility_cocoa.mm

Issue 2825803002: Expose internal treegrid role, do some cleanup for table/grid/treegrid handling (Closed)
Patch Set: Fix mac tests Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/accessibility/browser_accessibility_cocoa.mm
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index aeb609262e23c16ea0b9ab00eed6972f905fff7d..6e4d9704b27b08b6ed04f25e4dddcb5411df0af1 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -658,7 +658,7 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
}
- (NSNumber*)ariaColumnCount {
- if (!browserAccessibility_->IsTableOrGridOrTreeGridRole())
+ if (!browserAccessibility_->IsTableLikeRole())
return nil;
int count = -1;
if (!browserAccessibility_->GetIntAttribute(
@@ -699,7 +699,7 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
}
- (NSNumber*)ariaRowCount {
- if (!browserAccessibility_->IsTableOrGridOrTreeGridRole())
+ if (!browserAccessibility_->IsTableLikeRole())
return nil;
int count = -1;
if (!browserAccessibility_->GetIntAttribute(
@@ -778,8 +778,7 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
- (NSArray*)columnHeaders {
if (![self instanceActive])
return nil;
- if ([self internalRole] != ui::AX_ROLE_TABLE &&
- [self internalRole] != ui::AX_ROLE_GRID) {
+ if (!browserAccessibility_->IsTableLikeRole()) {
return nil;
}
@@ -1007,8 +1006,7 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
if (![self instanceActive])
return nil;
int headerElementId = -1;
- if ([self internalRole] == ui::AX_ROLE_TABLE ||
- [self internalRole] == ui::AX_ROLE_GRID) {
+ if (browserAccessibility_->IsTableLikeRole()) {
browserAccessibility_->GetIntAttribute(
ui::AX_ATTR_TABLE_HEADER_ID, &headerElementId);
} else if ([self internalRole] == ui::AX_ROLE_COLUMN) {
@@ -1516,8 +1514,7 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
- (NSArray*)rowHeaders {
if (![self instanceActive])
return nil;
- if ([self internalRole] != ui::AX_ROLE_TABLE &&
- [self internalRole] != ui::AX_ROLE_GRID) {
+ if (!browserAccessibility_->IsTableLikeRole()) {
return nil;
}

Powered by Google App Engine
This is Rietveld 408576698