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 0e7d09b3297aa9ada812f5d19bf7513c833810c1..2183b70e2e1193517467a925f122deff0a7113f2 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 |