Replace ShowAsPopupWithItems to CreatePopupWidgetWithInfo. Also,...

chrome/browser/renderer_host/render_widget_host.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_host/render_widget_host.h"
 
 #include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/keyboard_codes.h"
 #include "chrome/browser/renderer_host/backing_store.h"
@@ skipping 117 matching lines @@
   IPC_MESSAGE_HANDLER(ViewHostMsg_Focus, OnMsgFocus)
   IPC_MESSAGE_HANDLER(ViewHostMsg_Blur, OnMsgBlur)
   IPC_MESSAGE_HANDLER(ViewHostMsg_SetCursor, OnMsgSetCursor)
   IPC_MESSAGE_HANDLER(ViewHostMsg_ImeUpdateStatus, OnMsgImeUpdateStatus)
 #if defined(OS_LINUX)
   IPC_MESSAGE_HANDLER(ViewHostMsg_CreatePluginContainer,
                       OnMsgCreatePluginContainer)
   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)
 #endif
   IPC_MESSAGE_UNHANDLED_ERROR()
 IPC_END_MESSAGE_MAP()
 
 bool RenderWidgetHost::Send(IPC::Message* msg) {
   return process_->Send(msg);
 }
@@ skipping 596 matching lines @@
 }
 
 void RenderWidgetHost::OnMsgImeUpdateStatus(int control,
                                             const gfx::Rect& caret_rect) {
   if (view_) {
     view_->IMEUpdateStatus(control, caret_rect);
   }
 }
 
 #if defined(OS_LINUX)
+
 void RenderWidgetHost::OnMsgCreatePluginContainer(
     gfx::PluginWindowHandle *container) {
   *container = view_->CreatePluginContainer();
 }
 
 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,
                                           WebScreenInfo* results) {
   gfx::NativeView native_view = view_ ? view_->GetNativeView() : NULL;
   *results = WebScreenInfoFactory::screenInfo(native_view);
 }
 
 void RenderWidgetHost::OnMsgGetWindowRect(gfx::NativeViewId window_id,
                                           gfx::Rect* results) {
   if (view_) {
     *results = view_->GetWindowRect();
   }
 }
 
 void RenderWidgetHost::OnMsgGetRootWindowRect(gfx::NativeViewId window_id,
                                               gfx::Rect* results) {
   if (view_) {
     *results = view_->GetRootWindowRect();
   }
 }
+
 #endif
 
 void RenderWidgetHost::PaintBackingStoreRect(TransportDIB* bitmap,
                                              const gfx::Rect& bitmap_rect,
                                              const gfx::Size& view_size) {
   // The view may be destroyed already.
   if (!view_)
     return;
 
   if (is_hidden_) {
@@ skipping 33 matching lines @@
 
   // TODO(darin): do we need to do something else if our backing store is not
   // the same size as the advertised view?  maybe we just assume there is a
   // full paint on its way?
   BackingStore* backing_store = BackingStoreManager::Lookup(this);
   if (!backing_store || (backing_store->size() != view_size))
     return;
   backing_store->ScrollRect(process_->process().handle(), bitmap, bitmap_rect,
                             dx, dy, clip_rect, view_size);
 }