Aura on Android: content/browser

content/browser/frame_host/render_widget_host_view_child_frame.cc

Index: content/browser/frame_host/render_widget_host_view_child_frame.cc
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
index 07cd5b536522aa01c9c3c6fdf3f2aa683685b3b5..7aa6db21bac73ce6eadd736d47a6221a18bf02bd 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
@@ -223,7 +223,7 @@ void RenderWidgetHostViewChildFrame::SelectionBoundsChanged(
     const ViewHostMsg_SelectionBounds_Params& params) {
 }
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 void RenderWidgetHostViewChildFrame::LockCompositingSurface() {
 }
 
@@ -462,8 +462,9 @@ void RenderWidgetHostViewChildFrame::ReturnResources(
 BrowserAccessibilityManager*
 RenderWidgetHostViewChildFrame::CreateBrowserAccessibilityManager(
     BrowserAccessibilityDelegate* delegate) {
-  return BrowserAccessibilityManager::Create(
-      BrowserAccessibilityManager::GetEmptyDocument(), delegate);
+  return nullptr;

[no sievers, 2015/10/22 20:55:40]

up to you, but maybe you want to pull accessibility related changes out into a
different cl? otherwise ifdef and TODO(bug)

[mfomitchev, 2015/11/02 21:51:15]

Done.

+//  return BrowserAccessibilityManager::Create(
+//      BrowserAccessibilityManager::GetEmptyDocument(), delegate);
 }
 
 void RenderWidgetHostViewChildFrame::ClearCompositorSurfaceIfNecessary() {