| Index: content/browser/frame_host/render_widget_host_view_child_frame.h
|
| diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h
|
| index d031118a4d6173313ddfaf3324aa2ac852bec7ae..cf06b0c73794fc080786c88a1d833b0db0b1b000 100644
|
| --- a/content/browser/frame_host/render_widget_host_view_child_frame.h
|
| +++ b/content/browser/frame_host/render_widget_host_view_child_frame.h
|
| @@ -137,11 +137,14 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
|
| const NativeWebKeyboardEvent& event) OVERRIDE;
|
| #endif // defined(OS_MACOSX)
|
|
|
| -#if defined(OS_ANDROID)
|
| +#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
|
| // RenderWidgetHostViewBase implementation.
|
| virtual void ShowDisambiguationPopup(
|
| const gfx::Rect& target_rect,
|
| const SkBitmap& zoomed_bitmap) OVERRIDE;
|
| +#endif // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
|
| +
|
| +#if defined(OS_ANDROID)
|
| virtual void LockCompositingSurface() OVERRIDE;
|
| virtual void UnlockCompositingSurface() OVERRIDE;
|
| #endif // defined(OS_ANDROID)
|
|
|