Rename and move ui::AXNode::AXID to ui::AXNodeID
This is a pure refactoring. The issue here is that AXNode::AXID
was defined in ax_node.h, but it was used in some other files
that don't otherwise need to depend on ax_node.h - in particular
some Mojo typemaps needed in lacros dependencies.
By moving the definition to ax_node_data.h, we can
eliminate some unnecessary dependencies in a follow-up.
This change doesn't try to eliminate any dependencies, though -
it's just a pure mass-rename of ui::AXNode::AXID and
ui::AXNode::kInvalidAXID.
Bug: none
Change-Id: I9ebfac3214fd95fdb66d8fdee42c11270cdeab6d
AX-Relnotes: N/A
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2660021
Commit-Queue: Dominic Mazzoni <[email protected]>
Reviewed-by: Aaron Leventhal <[email protected]>
Reviewed-by: Luke Halliwell (slow) <[email protected]>
Cr-Commit-Position: refs/heads/master@{#848876}
diff --git a/ui/accessibility/ax_tree.h b/ui/accessibility/ax_tree.h
index ed8a45a..f735327 100644
--- a/ui/accessibility/ax_tree.h
+++ b/ui/accessibility/ax_tree.h
@@ -231,7 +231,7 @@
AXTableInfo* GetTableInfo(const AXNode* table_node) const override;
AXNode* CreateNode(AXNode* parent,
- AXNode::AXID id,
+ AXNodeID id,
size_t index_in_parent,
AXTreeUpdateState* update_state);
@@ -273,7 +273,7 @@
// We are passing the node id instead of ax node is because by the time this
// function is called, the ax node in the tree will already have been
// destroyed.
- void NotifyNodeHasBeenDeleted(AXNode::AXID node_id);
+ void NotifyNodeHasBeenDeleted(AXNodeID node_id);
// Notify the delegate that |node| has been created or reparented.
void NotifyNodeHasBeenReparentedOrCreated(
@@ -299,12 +299,12 @@
// Modifies |update_state| so that it knows what subtree and nodes are
// going to be destroyed for the subtree rooted at |node|.
- void MarkSubtreeForDestruction(AXNode::AXID node_id,
+ void MarkSubtreeForDestruction(AXNodeID node_id,
AXTreeUpdateState* update_state);
// Modifies |update_state| so that it knows what nodes are
// going to be destroyed for the subtree rooted at |node|.
- void MarkNodesForDestructionRecursive(AXNode::AXID node_id,
+ void MarkNodesForDestructionRecursive(AXNodeID node_id,
AXTreeUpdateState* update_state);
// Validates that destroying the subtree rooted at |node| has required
