1 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index ab436ec..a763388 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -676,6 +676,10 @@ bool RenderViewHost::SuddenTerminationAllowed() const {
   return sudden_termination_allowed_ || process()->sudden_termination_allowed();
 }
 
+void RenderViewHost::RequestAccessibilityTree() {
+  Send(new ViewMsg_GetAccessibilityTree(routing_id()));
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // RenderViewHost, IPC message handlers:
 
@@ -828,6 +832,7 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(ViewHostMsg_PageContents, OnPageContents)
     IPC_MESSAGE_HANDLER(ViewHostMsg_PageTranslated, OnPageTranslated)
     IPC_MESSAGE_HANDLER(ViewHostMsg_ContentBlocked, OnContentBlocked)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_AccessibilityTree, OnAccessibilityTree)
     // Have the super handle all other messages.
     IPC_MESSAGE_UNHANDLED(RenderWidgetHost::OnMessageReceived(msg))
   IPC_END_MESSAGE_MAP_EX()
@@ -1826,21 +1831,16 @@ void RenderViewHost::OnExtensionPostMessage(
 }
 
 void RenderViewHost::OnAccessibilityFocusChange(int acc_obj_id) {
-#if defined(OS_WIN)
-  BrowserAccessibilityManager::GetInstance()->ChangeAccessibilityFocus(
-      acc_obj_id, process()->id(), routing_id());
-#else
-  // TODO(port): accessibility not yet implemented. See http://crbug.com/8288.
-#endif
+  view()->OnAccessibilityFocusChange(acc_obj_id);
 }
 
 void RenderViewHost::OnAccessibilityObjectStateChange(int acc_obj_id) {
-#if defined(OS_WIN)
-  BrowserAccessibilityManager::GetInstance()->OnAccessibilityObjectStateChange(
-      acc_obj_id, process()->id(), routing_id());
-#else
-  // TODO(port): accessibility not yet implemented. See http://crbug.com/8288.
-#endif
+  view()->OnAccessibilityObjectStateChange(acc_obj_id);
+}
+
+void RenderViewHost::OnAccessibilityTree(
+    const webkit_glue::WebAccessibility& tree) {
+  view()->UpdateAccessibilityTree(tree);
 }
 
 void RenderViewHost::OnCSSInserted() {