| Index: content/browser/frame_host/render_widget_host_view_guest.h
|
| diff --git a/content/browser/frame_host/render_widget_host_view_guest.h b/content/browser/frame_host/render_widget_host_view_guest.h
|
| index 8ab05e925c03f9bbc1bfdac39a6e8f1dfcf1a1a0..8354189b4220bc4b01430fbe1c969b21ba787fdd 100644
|
| --- a/content/browser/frame_host/render_widget_host_view_guest.h
|
| +++ b/content/browser/frame_host/render_widget_host_view_guest.h
|
| @@ -123,7 +123,7 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest
|
| const SkBitmap& zoomed_bitmap) override;
|
| #endif // defined(OS_ANDROID) || defined(USE_AURA)
|
|
|
| -#if defined(OS_ANDROID)
|
| +#if defined(OS_ANDROID) && !defined(USE_AURA)
|
| void LockCompositingSurface() override;
|
| void UnlockCompositingSurface() override;
|
| #endif // defined(OS_ANDROID)
|
|
|