| 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 3894541e83b70598acce80aeb30fbd395adaf452..c807f9ecd677a64d3581def91b3e98a50ddf572e 100644
|
| --- a/content/browser/frame_host/render_widget_host_view_guest.h
|
| +++ b/content/browser/frame_host/render_widget_host_view_guest.h
|
| @@ -132,10 +132,13 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest
|
| 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,
|
| + 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;
|
| #endif // defined(OS_ANDROID)
|
|
|