| 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 141a10c6de9883db034ada6839b9a20fe9d6abbc..7a2f69a90f3420b62201f160537e813062930295 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,13 +137,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
|
| const NativeWebKeyboardEvent& event) OVERRIDE;
|
| #endif // defined(OS_MACOSX)
|
|
|
| -#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) || defined(USE_AURA)
|
| // RenderWidgetHostViewBase implementation.
|
| - virtual void ShowDisambiguationPopup(
|
| - const gfx::Rect& rect_pixels,
|
| - const SkBitmap& zoomed_bitmap) OVERRIDE;
|
| -#endif // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
|
| -
|
| #if defined(OS_ANDROID)
|
| virtual void LockCompositingSurface() OVERRIDE;
|
| virtual void UnlockCompositingSurface() OVERRIDE;
|
|
|