diff options
Diffstat (limited to 'chrome/browser')
4 files changed, 14 insertions, 13 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index 6481881..cdadd9e 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -135,7 +135,7 @@ IPC_DEFINE_MESSAGE_MAP(RenderWidgetHost) IPC_MESSAGE_HANDLER(ViewHostMsg_DestroyPluginContainer, OnMsgDestroyPluginContainer) #elif defined(OS_MACOSX) - IPC_MESSAGE_HANDLER_GENERIC(ViewHostMsg_ShowPopup, OnMsgShowPopup(msg)) + IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnMsgShowPopup) IPC_MESSAGE_HANDLER(ViewHostMsg_GetScreenInfo, OnMsgGetScreenInfo) IPC_MESSAGE_HANDLER(ViewHostMsg_GetWindowRect, OnMsgGetWindowRect) IPC_MESSAGE_HANDLER(ViewHostMsg_GetRootWindowRect, OnMsgGetRootWindowRect) @@ -752,6 +752,7 @@ void RenderWidgetHost::OnMsgImeUpdateStatus(int control, } #if defined(OS_LINUX) + void RenderWidgetHost::OnMsgCreatePluginContainer( gfx::PluginWindowHandle *container) { *container = view_->CreatePluginContainer(); @@ -761,18 +762,15 @@ void RenderWidgetHost::OnMsgDestroyPluginContainer( gfx::PluginWindowHandle container) { view_->DestroyPluginContainer(container); } + #elif defined(OS_MACOSX) -void RenderWidgetHost::OnMsgShowPopup(const IPC::Message& message) { - void* iter = NULL; - ViewHostMsg_ShowPopup_Params validated_params; - if (!IPC::ParamTraits<ViewHostMsg_ShowPopup_Params>::Read(&message, &iter, - &validated_params)) - return; - view_->ShowPopupWithItems(validated_params.bounds, - validated_params.item_height, - validated_params.selected_item, - validated_params.popup_items); +void RenderWidgetHost::OnMsgShowPopup( + const ViewHostMsg_ShowPopup_Params& params) { + view_->ShowPopupWithItems(params.bounds, + params.item_height, + params.selected_item, + params.popup_items); } void RenderWidgetHost::OnMsgGetScreenInfo(gfx::NativeViewId view, @@ -794,6 +792,7 @@ void RenderWidgetHost::OnMsgGetRootWindowRect(gfx::NativeViewId window_id, *results = view_->GetRootWindowRect(); } } + #endif void RenderWidgetHost::PaintBackingStoreRect(TransportDIB* bitmap, diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h index d2d2826..e133670 100644 --- a/chrome/browser/renderer_host/render_widget_host.h +++ b/chrome/browser/renderer_host/render_widget_host.h @@ -38,6 +38,7 @@ class TransportDIB; class WebCursor; struct ViewHostMsg_PaintRect_Params; struct ViewHostMsg_ScrollRect_Params; +struct ViewHostMsg_ShowPopup_Params; // This class manages the browser side of a browser<->renderer HWND connection. // The HWND lives in the browser process, and windows events are sent over @@ -396,7 +397,7 @@ class RenderWidgetHost : public IPC::Channel::Listener { void OnMsgCreatePluginContainer(gfx::PluginWindowHandle *container); void OnMsgDestroyPluginContainer(gfx::PluginWindowHandle container); #elif defined(OS_MACOSX) - void OnMsgShowPopup(const IPC::Message& message); + void OnMsgShowPopup(const ViewHostMsg_ShowPopup_Params& params); void OnMsgGetScreenInfo(gfx::NativeViewId view, WebKit::WebScreenInfo* results); void OnMsgGetWindowRect(gfx::NativeViewId window_id, gfx::Rect* results); diff --git a/chrome/browser/renderer_host/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h index fd72167..0837bc7 100644 --- a/chrome/browser/renderer_host/render_widget_host_view.h +++ b/chrome/browser/renderer_host/render_widget_host_view.h @@ -23,6 +23,7 @@ class BackingStore; class RenderProcessHost; class RenderWidgetHost; class WebCursor; +struct WebMenuItem; // RenderWidgetHostView is an interface implemented by an object that acts as // the "View" portion of a RenderWidgetHost. The RenderWidgetHost and its diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h index 270f00f..6c705db 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.h +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h @@ -13,8 +13,8 @@ #include "base/time.h" #include "chrome/browser/cocoa/base_view.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" - #include "webkit/glue/webcursor.h" +#include "webkit/glue/webmenuitem.h" class RenderWidgetHostViewMac; class RWHVMEditCommandHelper; |