Index: chrome/browser/renderer_host/render_widget_host_view_views.cc |
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc |
index 6396c4b515192c55f9c1b52613f0326b881ad53f..a4ae355edf9d7f99895a9d0533af7cffd3d7d6b0 100644 |
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc |
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc |
@@ -744,7 +744,7 @@ void RenderWidgetHostViewViews::OnPaint(gfx::Canvas* canvas) { |
paint_rect = paint_rect.Intersect(invalid_rect_); |
if (backing_store) { |
-#if defined(TOOLKIT_USES_GTK) |
+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA) |
// Only render the widget if it is attached to a window; there's a short |
// period where this object isn't attached to a window but hasn't been |
// Destroy()ed yet and it receives paint messages... |
@@ -764,7 +764,7 @@ void RenderWidgetHostViewViews::OnPaint(gfx::Canvas* canvas) { |
// TODO(sad) |
NOTIMPLEMENTED(); |
} |
-#if defined(TOOLKIT_USES_GTK) |
+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA) |
} |
#endif |
if (!whiteout_start_time_.is_null()) { |
@@ -875,3 +875,37 @@ void RenderWidgetHostViewViews::UpdateTouchSelectionController() { |
touch_selection_controller_->SelectionChanged(selection_start_, |
selection_end_); |
} |
+ |
+void RenderWidgetHostViewViews::UpdateCursor(const WebCursor& cursor) { |
+} |
+ |
+void RenderWidgetHostViewViews::ShowCurrentCursor() { |
+ NOTIMPLEMENTED(); |
+} |
+ |
+void RenderWidgetHostViewViews::GetDefaultScreenInfo( |
+ WebKit::WebScreenInfo* results) { |
+ NOTIMPLEMENTED(); |
+} |
+ |
+void RenderWidgetHostViewViews::GetScreenInfo(WebKit::WebScreenInfo* results) { |
+ NOTIMPLEMENTED(); |
+} |
+ |
+gfx::Rect RenderWidgetHostViewViews::GetRootWindowBounds() { |
+ NOTIMPLEMENTED(); |
+ return gfx::Rect(); |
+} |
+ |
+gfx::PluginWindowHandle RenderWidgetHostViewViews::GetCompositingSurface() { |
+ NOTIMPLEMENTED(); |
+ return 0; |
+} |
+ |
+#if defined(USE_AURA) |
+// static |
+RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( |
+ RenderWidgetHost* widget) { |
+ return new RenderWidgetHostViewViews(widget); |
+} |
+#endif |