Index: chrome/browser/renderer_host/render_widget_host_view_views.h |
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.h b/chrome/browser/renderer_host/render_widget_host_view_views.h |
index e81b48d11b4ae093c5cdd59eb369ab504ccf5b5d..71dcc16e96b53ce765935c8fc7b9fbf0fd241466 100644 |
--- a/chrome/browser/renderer_host/render_widget_host_view_views.h |
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.h |
@@ -88,10 +88,11 @@ class RenderWidgetHostViewViews : public RenderWidgetHostView, |
virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE; |
virtual void SetBackground(const SkBitmap& background) OVERRIDE; |
#if defined(OS_POSIX) |
+ virtual void GetDefaultScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; |
virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; |
virtual gfx::Rect GetRootWindowBounds() OVERRIDE; |
#endif |
-#if defined(TOOLKIT_USES_GTK) |
+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA) |
virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE; |
virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE; |
#endif |
@@ -103,7 +104,7 @@ class RenderWidgetHostViewViews : public RenderWidgetHostView, |
bool has_horizontal_scrollbar) OVERRIDE; |
virtual void SetScrollOffsetPinning( |
bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; |
-#if defined(TOOLKIT_USES_GTK) |
+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA) |
virtual void AcceleratedCompositingActivated(bool activated) OVERRIDE; |
#endif |
#if defined(OS_WIN) |