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 add827ae4493adc9cc4f2eb1ef83dbbb80463125..fe5816b23aee14277454c47bfc050bc806e214ed 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)
     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() {