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

Unified Diff: content/browser/accessibility/accessibility_tree_formatter.cc

Issue 15741009: Native Android accessibility. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address most reviewer feedback Created 7 years, 6 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/accessibility_tree_formatter.cc
diff --git a/content/browser/accessibility/accessibility_tree_formatter.cc b/content/browser/accessibility/accessibility_tree_formatter.cc
index 84f200aeed536ee9fbf881abae459500bd66e1b9..6da20729e9984bda082a51ec220e005afd9cc850 100644
--- a/content/browser/accessibility/accessibility_tree_formatter.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter.cc
@@ -63,8 +63,12 @@ void AccessibilityTreeFormatter::FormatAccessibilityTree(
void AccessibilityTreeFormatter::RecursiveBuildAccessibilityTree(
const BrowserAccessibility& node, DictionaryValue* dict) {
AddProperties(node, dict);
+
ListValue* children = new ListValue;
dict->Set(kChildrenDictAttr, children);
+ if (!IncludeChildren(node))
+ return;
+
for (size_t i = 0; i < node.children().size(); ++i) {
BrowserAccessibility* child_node = node.children()[i];
DictionaryValue* child_dict = new DictionaryValue;
@@ -89,7 +93,14 @@ void AccessibilityTreeFormatter::RecursiveFormatAccessibilityTree(
}
}
-#if (!defined(OS_WIN) && !defined(OS_MACOSX))
+#if !defined(OS_ANDROID)
+bool AccessibilityTreeFormatter::IncludeChildren(
+ const BrowserAccessibility& node) {
+ return true;
+}
+#endif
+
+#if (!defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_ANDROID))
void AccessibilityTreeFormatter::AddProperties(const BrowserAccessibility& node,
DictionaryValue* dict) {
dict->SetInteger("id", node.renderer_id());

Powered by Google App Engine
This is Rietveld 408576698