NOT FOR REVIEW: Aura on Android

content/browser/frame_host/render_widget_host_view_child_frame.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/surfaces/surface_factory_client.h"
@@ skipping 115 matching lines @@
   void SpeakSelection() override;
   bool IsSpeaking() const override;
   void StopSpeaking() override;
 
   // RenderWidgetHostViewBase implementation.
   bool PostProcessEventForPluginIme(
       const NativeWebKeyboardEvent& event) override;
 #endif  // defined(OS_MACOSX)
 
   // RenderWidgetHostViewBase implementation.
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   void LockCompositingSurface() override;
   void UnlockCompositingSurface() override;
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_WIN)
   void SetParentNativeViewAccessible(
       gfx::NativeViewAccessible accessible_parent) override;
   gfx::NativeViewId GetParentForWindowlessPlugin() const override;
 #endif
   BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
@@ skipping 44 matching lines @@
   }
 
  private:
   base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_