| Index: content/browser/renderer_host/test_render_view_host.h
|
| diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h
|
| index d222e98960cf2cad68031a0e5465be73371df6e2..365a05bdfe920b37caac52b4ff5f69badc2047ba 100644
|
| --- a/content/browser/renderer_host/test_render_view_host.h
|
| +++ b/content/browser/renderer_host/test_render_view_host.h
|
| @@ -67,12 +67,10 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
|
| virtual void SetWindowVisibility(bool visible) OVERRIDE {}
|
| virtual void WindowFrameChanged() OVERRIDE {}
|
| #endif // defined(OS_MACOSX)
|
| -#if defined(TOOLKIT_USES_GTK)
|
| +#if defined(TOOLKIT_GTK)
|
| virtual GdkEventButton* GetLastMouseDown() OVERRIDE;
|
| -#if !defined(TOOLKIT_VIEWS)
|
| virtual gfx::NativeView BuildInputMethodsGtkMenu() OVERRIDE;
|
| -#endif // !defined(TOOLKIT_VIEWS)
|
| -#endif // defined(TOOLKIT_USES_GTK)
|
| +#endif // defined(TOOLKIT_GTK)
|
| virtual bool CopyFromCompositingSurface(
|
| const gfx::Size& size,
|
| skia::PlatformCanvas* output) OVERRIDE;
|
| @@ -151,10 +149,10 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
|
| virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE { }
|
| #endif
|
|
|
| -#if defined(TOOLKIT_USES_GTK)
|
| +#if defined(TOOLKIT_GTK)
|
| virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE { }
|
| virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE { }
|
| -#endif // defined(TOOLKIT_USES_GTK)
|
| +#endif // defined(TOOLKIT_GTK)
|
|
|
| virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
|
|
|
|
|