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 ad7ba44b5bad8dec9b27fe663eef69d5b17d1a36..a7ec4c101473f669beb75b343d86f42ebe513113 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 SkBitmap& zoomed_bitmap) OVERRIDE {} |
+#endif |
+#if defined(OS_ANDROID) |
virtual void LockCompositingSurface() OVERRIDE {} |
virtual void UnlockCompositingSurface() OVERRIDE {} |
#endif |