| 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..47a5c20dc6afce954d7b20ff2fa1e51f22f2a4fd 100644
|
| --- a/content/browser/renderer_host/render_widget_host.cc
|
| +++ b/content/browser/renderer_host/render_widget_host.cc
|
| @@ -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() {
|
|
|