| Index: content/test/test_render_view_host.h
|
| diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
|
| index 51f662db2753f9e6f8c482d7208f02059bb37c90..f478fed19a31a27fbac47eafcf4d8067a8bfce98 100644
|
| --- a/content/test/test_render_view_host.h
|
| +++ b/content/test/test_render_view_host.h
|
| @@ -137,10 +137,13 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
|
| #if defined(OS_MACOSX)
|
| virtual bool PostProcessEventForPluginIme(
|
| const NativeWebKeyboardEvent& event) OVERRIDE;
|
| -#elif defined(OS_ANDROID)
|
| +#endif
|
| +#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
|
| virtual void ShowDisambiguationPopup(
|
| - const gfx::Rect& target_rect,
|
| + const gfx::Rect& rect_pixels,
|
| const SkBitmap& zoomed_bitmap) OVERRIDE {}
|
| +#endif
|
| +#if defined(OS_ANDROID)
|
| virtual void LockCompositingSurface() OVERRIDE {}
|
| virtual void UnlockCompositingSurface() OVERRIDE {}
|
| #endif
|
|
|