diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 17:28:50 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 17:28:50 +0000 |
| commit | 3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea (patch) | |
| tree | 84794a37e500c230cb702d38aed4f3363afe755f /content/browser/renderer_host | |
| parent | 97fe97e78d76db3c5a0ee7c1baa06d1fcd082a1a (diff) | |
| download | chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.zip chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.tar.gz chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.tar.bz2 | |
Aura under Linux is enabled with:
'use_aura': 1,
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7850026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host')
3 files changed, 8 insertions, 5 deletions
diff --git a/content/browser/renderer_host/render_message_filter_aura.cc b/content/browser/renderer_host/render_message_filter_aura.cc index 311b163..a4d7a04 100644 --- a/content/browser/renderer_host/render_message_filter_aura.cc +++ b/content/browser/renderer_host/render_message_filter_aura.cc @@ -6,7 +6,7 @@ // TODO(shess): Provide a mapping from reply_msg->routing_id() to HWND // so that we can eliminate the NativeViewId parameter. - +#if defined(OS_WIN) void RenderMessageFilter::OnGetWindowRect(gfx::NativeViewId window_id, gfx::Rect* rect) { // TODO(beng): @@ -26,3 +26,4 @@ void RenderMessageFilter::OnGetScreenInfo(gfx::NativeViewId view, // TODO(beng): NOTIMPLEMENTED(); } +#endif // OS_WIN diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc index add827a..fe5816b 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() { diff --git a/content/browser/renderer_host/render_widget_host_view.cc b/content/browser/renderer_host/render_widget_host_view.cc index 6f16071..ba714df 100644 --- a/content/browser/renderer_host/render_widget_host_view.cc +++ b/content/browser/renderer_host/render_widget_host_view.cc @@ -10,7 +10,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h" #endif -#if defined(TOUCH_UI) +#if defined(TOUCH_UI) || defined(USE_AURA) #include <gdk/gdkx.h> #include <gtk/gtk.h> @@ -29,7 +29,7 @@ void RenderWidgetHostView::GetDefaultScreenInfo( // TODO(erg): move this to render_widget_host_view_views_gtk.cc when if it // moves to content. -#if defined(TOUCH_UI) +#if defined(TOUCH_UI) || defined(USE_AURA) // static void RenderWidgetHostView::GetDefaultScreenInfo( WebKit::WebScreenInfo* results) { |