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

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

Issue 940753002: accessibility: Simpler AXTree root accessor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix win Created 5 years, 10 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_manager.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc
index 34a82257c4d120df620b8e1a00b49630dd5038de..8f61b90408640a72b13bc228fac9b21067b7bfee 100644
--- a/content/browser/accessibility/browser_accessibility_manager.cc
+++ b/content/browser/accessibility/browser_accessibility_manager.cc
@@ -114,7 +114,7 @@ void BrowserAccessibilityManager::Initialize(
}
if (!focus_)
- SetFocus(tree_->GetRoot(), false);
+ SetFocus(tree_->root(), false);
}
// static
@@ -128,7 +128,7 @@ ui::AXTreeUpdate BrowserAccessibilityManager::GetEmptyDocument() {
}
BrowserAccessibility* BrowserAccessibilityManager::GetRoot() {
- return GetFromAXNode(tree_->GetRoot());
+ return GetFromAXNode(tree_->root());
}
BrowserAccessibility* BrowserAccessibilityManager::GetFromAXNode(
@@ -198,7 +198,7 @@ void BrowserAccessibilityManager::OnAccessibilityEvents(
// Set focus to the root if it's not anywhere else.
if (!focus_) {
- SetFocus(tree_->GetRoot(), false);
+ SetFocus(tree_->root(), false);
should_send_initial_focus = true;
}
}
@@ -420,8 +420,8 @@ BrowserAccessibility* BrowserAccessibilityManager::PreviousInTreeOrder(
void BrowserAccessibilityManager::OnNodeWillBeDeleted(ui::AXNode* node) {
if (node == focus_ && tree_) {
- if (node != tree_->GetRoot())
- SetFocus(tree_->GetRoot(), false);
+ if (node != tree_->root())
+ SetFocus(tree_->root(), false);
else
focus_ = NULL;
}
@@ -471,7 +471,7 @@ ui::AXTreeUpdate BrowserAccessibilityManager::SnapshotAXTreeForTesting() {
tree_->CreateTreeSource());
ui::AXTreeSerializer<const ui::AXNode*> serializer(tree_source.get());
ui::AXTreeUpdate update;
- serializer.SerializeChanges(tree_->GetRoot(), &update);
+ serializer.SerializeChanges(tree_->root(), &update);
return update;
}

Powered by Google App Engine
This is Rietveld 408576698