Aura on Android: content/browser

content/browser/frame_host/render_widget_host_view_child_frame.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
 
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_sequence.h"
@@ skipping 205 matching lines @@
 void RenderWidgetHostViewChildFrame::SelectionChanged(
     const base::string16& text,
     size_t offset,
     const gfx::Range& range) {
 }
 
 void RenderWidgetHostViewChildFrame::SelectionBoundsChanged(
     const ViewHostMsg_SelectionBounds_Params& params) {
 }
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 void RenderWidgetHostViewChildFrame::LockCompositingSurface() {
 }
 
 void RenderWidgetHostViewChildFrame::UnlockCompositingSurface() {
 }
 #endif
 
 void RenderWidgetHostViewChildFrame::SurfaceDrawn(uint32 output_surface_id,
                                                   cc::SurfaceDrawStatus drawn) {
   cc::CompositorFrameAck ack;
@@ skipping 218 matching lines @@
     return;
   }
 
   std::copy(resources.begin(), resources.end(),
             std::back_inserter(surface_returned_resources_));
 }
 
 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() {
   if (surface_factory_ && !surface_id_.is_null())
     surface_factory_->Destroy(surface_id_);
   surface_id_ = cc::SurfaceId();
 }
 
 }  // namespace content