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

Unified Diff: ui/accessibility/ax_serializable_tree.cc

Issue 1413423003: Move some AX attrs from AXNodeData to AXTreeData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « ui/accessibility/ax_serializable_tree.h ('k') | ui/accessibility/ax_tree.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/accessibility/ax_serializable_tree.cc
diff --git a/ui/accessibility/ax_serializable_tree.cc b/ui/accessibility/ax_serializable_tree.cc
index 9c13fd085de47d42b899d514c601983739db6d42..c5542c95ab06df1f589455fa508acb882e34dfd2 100644
--- a/ui/accessibility/ax_serializable_tree.cc
+++ b/ui/accessibility/ax_serializable_tree.cc
@@ -15,12 +15,14 @@ namespace ui {
// AXTree directly. Another AXTreeSource is used to abstract the Blink
// accessibility tree.
class AX_EXPORT AXTreeSourceAdapter
- : public AXTreeSource<const AXNode*, AXNodeData> {
+ : public AXTreeSource<const AXNode*, AXNodeData, AXTreeData> {
public:
AXTreeSourceAdapter(AXTree* tree) : tree_(tree) {}
~AXTreeSourceAdapter() override {}
// AXTreeSource implementation.
+ AXTreeData GetTreeData() const override { return tree_->data(); }
+
AXNode* GetRoot() const override { return tree_->root(); }
AXNode* GetFromId(int32 id) const override { return tree_->GetFromId(id); }
@@ -57,14 +59,14 @@ AXSerializableTree::AXSerializableTree()
: AXTree() {}
AXSerializableTree::AXSerializableTree(
- const AXTreeUpdate<AXNodeData>& initial_state)
+ const AXTreeUpdate& initial_state)
: AXTree(initial_state) {
}
AXSerializableTree::~AXSerializableTree() {
}
-AXTreeSource<const AXNode*, AXNodeData>*
+AXTreeSource<const AXNode*, AXNodeData, AXTreeData>*
AXSerializableTree::CreateTreeSource() {
return new AXTreeSourceAdapter(this);
}
« no previous file with comments | « ui/accessibility/ax_serializable_tree.h ('k') | ui/accessibility/ax_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698