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

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

Issue 1407413002: Move some AX attrs from AXNodeData to AXTreeData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 2 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 7f408f6cef78246a0bbf6b0109fc53483415d027..4dbeff2678a8ab4afd7bd8de47d90b17cac8be71 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -768,8 +768,8 @@ bool InitializeAccessibilityTreeSearch(
}
- (NSNumber*)loadingProgress {
- float floatValue = browserAccessibility_->GetFloatAttribute(
- ui::AX_ATTR_DOC_LOADING_PROGRESS);
+ BrowserAccessibilityManager* manager = browserAccessibility_->manager();
+ float floatValue = manager->GetTreeData().loading_progress;
return [NSNumber numberWithFloat:floatValue];
}
@@ -1205,16 +1205,16 @@ bool InitializeAccessibilityTreeSearch(
}
- (NSURL*)url {
- StringAttribute urlAttribute =
- [[self role] isEqualToString:@"AXWebArea"] ?
- ui::AX_ATTR_DOC_URL :
- ui::AX_ATTR_URL;
+ std::string url;
+ if ([[self role] isEqualToString:@"AXWebArea"])
+ url = browserAccessibility_->manager()->GetTreeData().url;
+ else
+ url = browserAccessibility_->GetStringAttribute(ui::AX_ATTR_URL);
- std::string urlStr = browserAccessibility_->GetStringAttribute(urlAttribute);
- if (urlStr.empty())
+ if (url.empty())
return nil;
- return [NSURL URLWithString:(base::SysUTF8ToNSString(urlStr))];
+ return [NSURL URLWithString:(base::SysUTF8ToNSString(url))];
}
- (id)value {

Powered by Google App Engine
This is Rietveld 408576698