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 c3fde966a4c77e5d0da5051aea72ceaf905cb853..a5b7809fdedfe9c9637aaba9357accfd0f38c399 100644 |
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm |
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm |
@@ -770,8 +770,8 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired"; |
if (![self isIgnored]) { |
children_.reset(); |
} else { |
- [ToBrowserAccessibilityCocoa(browserAccessibility_->GetParent()) |
- childrenChanged]; |
+ [ToBrowserAccessibilityCocoa( |
+ browserAccessibility_->GetAccessibilityParent()) childrenChanged]; |
} |
} |
@@ -1243,9 +1243,9 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired"; |
if (![self instanceActive]) |
return nil; |
// A nil parent means we're the root. |
- if (browserAccessibility_->GetParent()) { |
- return NSAccessibilityUnignoredAncestor( |
- ToBrowserAccessibilityCocoa(browserAccessibility_->GetParent())); |
+ if (browserAccessibility_->GetAccessibilityParent()) { |
+ return NSAccessibilityUnignoredAncestor(ToBrowserAccessibilityCocoa( |
+ browserAccessibility_->GetAccessibilityParent())); |
} else { |
// Hook back up to RenderWidgetHostViewCocoa. |
BrowserAccessibilityManagerMac* manager = |
@@ -2417,7 +2417,7 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired"; |
if (!child) |
return nil; |
- if (child->GetParent() != browserAccessibility_) |
+ if (child->GetAccessibilityParent() != browserAccessibility_) |
return nil; |
return @(child->GetIndexInParent()); |
@@ -2648,9 +2648,9 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired"; |
NSAccessibilityDisclosedRowsAttribute |
]]; |
} else if ([role isEqualToString:NSAccessibilityRowRole]) { |
- if (browserAccessibility_->GetParent()) { |
+ if (browserAccessibility_->GetAccessibilityParent()) { |
base::string16 parentRole; |
- browserAccessibility_->GetParent()->GetHtmlAttribute( |
+ browserAccessibility_->GetAccessibilityParent()->GetHtmlAttribute( |
"role", &parentRole); |
const base::string16 treegridRole(base::ASCIIToUTF16("treegrid")); |
if (parentRole == treegridRole) { |