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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/accessibility_browser_test_utils.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/accessibility_browser_test_utils.cc
diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc
index e91b2cf23987049983a4b10c74d2ac47ef17e215..ba0331c485fc84a0e910821e39473ee3d2dd3237 100644
--- a/content/test/accessibility_browser_test_utils.cc
+++ b/content/test/accessibility_browser_test_utils.cc
@@ -8,9 +8,8 @@
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
-#include "content/browser/web_contents/web_contents_impl.h"
#include "content/common/view_message_enums.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
@@ -27,9 +26,9 @@
weak_factory_(this),
event_target_id_(0) {
WebContents* web_contents = shell_->web_contents();
- frame_host_ = static_cast<RenderFrameHostImpl*>(
- web_contents->GetMainFrame());
- frame_host_->SetAccessibilityCallbackForTesting(
+ view_host_ = static_cast<RenderViewHostImpl*>(
+ web_contents->GetRenderViewHost());
+ view_host_->SetAccessibilityCallbackForTesting(
base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
weak_factory_.GetWeakPtr()));
}
@@ -43,14 +42,13 @@
loop_runner_(new MessageLoopRunner()),
weak_factory_(this),
event_target_id_(0) {
- WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
- shell_->web_contents());
- frame_host_ = static_cast<RenderFrameHostImpl*>(
- web_contents->GetMainFrame());
- frame_host_->SetAccessibilityCallbackForTesting(
+ WebContents* web_contents = shell_->web_contents();
+ view_host_ = static_cast<RenderViewHostImpl*>(
+ web_contents->GetRenderViewHost());
+ view_host_->SetAccessibilityCallbackForTesting(
base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
weak_factory_.GetWeakPtr()));
- web_contents->AddAccessibilityMode(accessibility_mode);
+ view_host_->AddAccessibilityMode(accessibility_mode);
}
AccessibilityNotificationWaiter::~AccessibilityNotificationWaiter() {
@@ -61,7 +59,7 @@
}
const ui::AXTree& AccessibilityNotificationWaiter::GetAXTree() const {
- return *frame_host_->GetAXTreeForTesting();
+ return view_host_->ax_tree_for_testing();
}
void AccessibilityNotificationWaiter::OnAccessibilityEvent(
« 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