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

Side by Side Diff: content/test/accessibility_browser_test_utils.cc

Issue 407493002: Revert of Migrate accessibility from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/test/accessibility_browser_test_utils.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/test/accessibility_browser_test_utils.h" 5 #include "content/test/accessibility_browser_test_utils.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "content/browser/frame_host/render_frame_host_impl.h" 11 #include "content/browser/renderer_host/render_view_host_impl.h"
12 #include "content/browser/renderer_host/render_widget_host_view_base.h" 12 #include "content/browser/renderer_host/render_widget_host_view_base.h"
13 #include "content/browser/web_contents/web_contents_impl.h"
14 #include "content/common/view_message_enums.h" 13 #include "content/common/view_message_enums.h"
15 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
16 #include "content/public/common/url_constants.h" 15 #include "content/public/common/url_constants.h"
17 #include "content/public/test/test_utils.h" 16 #include "content/public/test/test_utils.h"
18 #include "content/shell/browser/shell.h" 17 #include "content/shell/browser/shell.h"
19 #include "ui/accessibility/ax_node.h" 18 #include "ui/accessibility/ax_node.h"
20 19
21 namespace content { 20 namespace content {
22 21
23 AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(Shell* shell) 22 AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(Shell* shell)
24 : shell_(shell), 23 : shell_(shell),
25 event_to_wait_for_(ui::AX_EVENT_NONE), 24 event_to_wait_for_(ui::AX_EVENT_NONE),
26 loop_runner_(new MessageLoopRunner()), 25 loop_runner_(new MessageLoopRunner()),
27 weak_factory_(this), 26 weak_factory_(this),
28 event_target_id_(0) { 27 event_target_id_(0) {
29 WebContents* web_contents = shell_->web_contents(); 28 WebContents* web_contents = shell_->web_contents();
30 frame_host_ = static_cast<RenderFrameHostImpl*>( 29 view_host_ = static_cast<RenderViewHostImpl*>(
31 web_contents->GetMainFrame()); 30 web_contents->GetRenderViewHost());
32 frame_host_->SetAccessibilityCallbackForTesting( 31 view_host_->SetAccessibilityCallbackForTesting(
33 base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent, 32 base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
34 weak_factory_.GetWeakPtr())); 33 weak_factory_.GetWeakPtr()));
35 } 34 }
36 35
37 AccessibilityNotificationWaiter::AccessibilityNotificationWaiter( 36 AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(
38 Shell* shell, 37 Shell* shell,
39 AccessibilityMode accessibility_mode, 38 AccessibilityMode accessibility_mode,
40 ui::AXEvent event_type) 39 ui::AXEvent event_type)
41 : shell_(shell), 40 : shell_(shell),
42 event_to_wait_for_(event_type), 41 event_to_wait_for_(event_type),
43 loop_runner_(new MessageLoopRunner()), 42 loop_runner_(new MessageLoopRunner()),
44 weak_factory_(this), 43 weak_factory_(this),
45 event_target_id_(0) { 44 event_target_id_(0) {
46 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>( 45 WebContents* web_contents = shell_->web_contents();
47 shell_->web_contents()); 46 view_host_ = static_cast<RenderViewHostImpl*>(
48 frame_host_ = static_cast<RenderFrameHostImpl*>( 47 web_contents->GetRenderViewHost());
49 web_contents->GetMainFrame()); 48 view_host_->SetAccessibilityCallbackForTesting(
50 frame_host_->SetAccessibilityCallbackForTesting(
51 base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent, 49 base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
52 weak_factory_.GetWeakPtr())); 50 weak_factory_.GetWeakPtr()));
53 web_contents->AddAccessibilityMode(accessibility_mode); 51 view_host_->AddAccessibilityMode(accessibility_mode);
54 } 52 }
55 53
56 AccessibilityNotificationWaiter::~AccessibilityNotificationWaiter() { 54 AccessibilityNotificationWaiter::~AccessibilityNotificationWaiter() {
57 } 55 }
58 56
59 void AccessibilityNotificationWaiter::WaitForNotification() { 57 void AccessibilityNotificationWaiter::WaitForNotification() {
60 loop_runner_->Run(); 58 loop_runner_->Run();
61 } 59 }
62 60
63 const ui::AXTree& AccessibilityNotificationWaiter::GetAXTree() const { 61 const ui::AXTree& AccessibilityNotificationWaiter::GetAXTree() const {
64 return *frame_host_->GetAXTreeForTesting(); 62 return view_host_->ax_tree_for_testing();
65 } 63 }
66 64
67 void AccessibilityNotificationWaiter::OnAccessibilityEvent( 65 void AccessibilityNotificationWaiter::OnAccessibilityEvent(
68 ui::AXEvent event_type, int event_target_id) { 66 ui::AXEvent event_type, int event_target_id) {
69 if (!IsAboutBlank() && (event_to_wait_for_ == ui::AX_EVENT_NONE || 67 if (!IsAboutBlank() && (event_to_wait_for_ == ui::AX_EVENT_NONE ||
70 event_to_wait_for_ == event_type)) { 68 event_to_wait_for_ == event_type)) {
71 event_target_id_ = event_target_id; 69 event_target_id_ = event_target_id;
72 loop_runner_->Quit(); 70 loop_runner_->Quit();
73 } 71 }
74 } 72 }
75 73
76 bool AccessibilityNotificationWaiter::IsAboutBlank() { 74 bool AccessibilityNotificationWaiter::IsAboutBlank() {
77 // Skip any accessibility notifications related to "about:blank", 75 // Skip any accessibility notifications related to "about:blank",
78 // to avoid a possible race condition between the test beginning 76 // to avoid a possible race condition between the test beginning
79 // listening for accessibility events and "about:blank" loading. 77 // listening for accessibility events and "about:blank" loading.
80 const ui::AXNodeData& root = GetAXTree().GetRoot()->data(); 78 const ui::AXNodeData& root = GetAXTree().GetRoot()->data();
81 for (size_t i = 0; i < root.string_attributes.size(); ++i) { 79 for (size_t i = 0; i < root.string_attributes.size(); ++i) {
82 if (root.string_attributes[i].first != ui::AX_ATTR_DOC_URL) 80 if (root.string_attributes[i].first != ui::AX_ATTR_DOC_URL)
83 continue; 81 continue;
84 const std::string& doc_url = root.string_attributes[i].second; 82 const std::string& doc_url = root.string_attributes[i].second;
85 return doc_url == url::kAboutBlankURL; 83 return doc_url == url::kAboutBlankURL;
86 } 84 }
87 return false; 85 return false;
88 } 86 }
89 87
90 } // namespace content 88 } // namespace content
OLDNEW
« no previous file with comments | « content/test/accessibility_browser_test_utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698