Aura under Linux

content/browser/renderer_host/render_widget_host.cc

Index: content/browser/renderer_host/render_widget_host.cc
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index e370fe45b793bd636b9a2228d866e01f9fd1089a..ff6dec4c5906713f1c147a1659760c066d6c4688 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -204,7 +204,7 @@ bool RenderWidgetHost::OnMessageReceived(const IPC::Message &msg) {
     IPC_MESSAGE_HANDLER(ViewHostMsg_AcceleratedSurfaceBuffersSwapped,
                         OnAcceleratedSurfaceBuffersSwapped)
 #endif
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)

[Ben Goodger (Google), 2011/09/16 01:11:18]

TOOLKIT_USES_GTK should never be defined with USE_AURA, so this extra check
should not be necessary.

[Emmanuel Saint-loubert-Bié, 2011/09/16 02:34:54]

Unfortunately even under PureViews we might need to run some GTK. I will redo a
pass for these later on.

     IPC_MESSAGE_HANDLER(ViewHostMsg_CreatePluginContainer,
                         OnMsgCreatePluginContainer)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DestroyPluginContainer,
@@ -1105,7 +1105,7 @@ void RenderWidgetHost::OnMsgDidActivateAcceleratedCompositing(bool activated) {
 #elif defined(OS_WIN)
   if (view_)
     view_->ShowCompositorHostWindow(is_accelerated_compositing_active_);
-#elif defined(TOOLKIT_USES_GTK)
+#elif defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
   if (view_)
     view_->AcceleratedCompositingActivated(activated);
 #endif
@@ -1237,6 +1237,7 @@ void RenderWidgetHost::ProcessKeyboardEventAck(int type, bool processed) {
 }
 
 void RenderWidgetHost::ActivateDeferredPluginHandles() {
+#if !defined(USE_AURA)
   if (view_ == NULL)
     return;
 
@@ -1247,6 +1248,7 @@ void RenderWidgetHost::ActivateDeferredPluginHandles() {
   }
 
   deferred_plugin_handles_.clear();
+#endif
 }
 
 void RenderWidgetHost::StartUserGesture() {