diff options
author | dmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-06 22:30:54 +0000 |
---|---|---|
committer | dmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-06 22:30:54 +0000 |
commit | 5eec2f56c9ad54bbb2ed150d67a2b46d9a01cc68 (patch) | |
tree | 73f3a82eb83f997dd4454fca180da67640dce643 /content/test/accessibility_browser_test_utils.cc | |
parent | 06173a82fdb09588840ceea826486beb83fbe4fd (diff) | |
download | chromium_src-5eec2f56c9ad54bbb2ed150d67a2b46d9a01cc68.zip chromium_src-5eec2f56c9ad54bbb2ed150d67a2b46d9a01cc68.tar.gz chromium_src-5eec2f56c9ad54bbb2ed150d67a2b46d9a01cc68.tar.bz2 |
Refactor content/ to use ui::AXNodeData instead of blink.
This is a huge change, but it's all refactoring / renaming.
There should be no new logic.
BUG=316726
R=dtseng@chromium.org, jam@chromium.org, tsepez@chromium.org
Review URL: https://codereview.chromium.org/116293005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/accessibility_browser_test_utils.cc')
-rw-r--r-- | content/test/accessibility_browser_test_utils.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc index 525ed30..67e5811 100644 --- a/content/test/accessibility_browser_test_utils.cc +++ b/content/test/accessibility_browser_test_utils.cc @@ -14,13 +14,14 @@ #include "content/public/common/url_constants.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" +#include "ui/accessibility/ax_node.h" namespace content { AccessibilityNotificationWaiter::AccessibilityNotificationWaiter( Shell* shell, AccessibilityMode accessibility_mode, - blink::WebAXEvent event_type) + ui::AXEvent event_type) : shell_(shell), event_to_wait_for_(event_type), loop_runner_(new MessageLoopRunner()), @@ -41,13 +42,12 @@ void AccessibilityNotificationWaiter::WaitForNotification() { loop_runner_->Run(); } -const AccessibilityNodeDataTreeNode& -AccessibilityNotificationWaiter::GetAccessibilityNodeDataTree() const { - return view_host_->accessibility_tree_for_testing(); +const ui::AXTree& AccessibilityNotificationWaiter::GetAXTree() const { + return view_host_->ax_tree_for_testing(); } void AccessibilityNotificationWaiter::OnAccessibilityEvent( - blink::WebAXEvent event_type) { + ui::AXEvent event_type) { if (!IsAboutBlank() && event_to_wait_for_ == event_type) loop_runner_->Quit(); } @@ -56,9 +56,9 @@ bool AccessibilityNotificationWaiter::IsAboutBlank() { // Skip any accessibility notifications related to "about:blank", // to avoid a possible race condition between the test beginning // listening for accessibility events and "about:blank" loading. - const AccessibilityNodeDataTreeNode& root = GetAccessibilityNodeDataTree(); + const ui::AXNodeData& root = GetAXTree().GetRoot()->data(); for (size_t i = 0; i < root.string_attributes.size(); ++i) { - if (root.string_attributes[i].first != AccessibilityNodeData::ATTR_DOC_URL) + if (root.string_attributes[i].first != ui::AX_ATTR_DOC_URL) continue; const std::string& doc_url = root.string_attributes[i].second; return doc_url == kAboutBlankURL; |