Replace ShowAsPopupWithItems to CreatePopupWidgetWithInfo. Also,...

chrome/renderer/render_widget.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/renderer/render_widget.h"
 
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "build/build_config.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/renderer/render_process.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "webkit/api/public/WebCursorInfo.h"
+#include "webkit/api/public/WebPopupMenuInfo.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebScreenInfo.h"
 #include "webkit/api/public/WebSize.h"
 
 #if defined(OS_POSIX)
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
 #endif  // defined(OS_POSIX)
 
 #include "webkit/glue/webtextdirection.h"
 #include "webkit/glue/webwidget.h"
 
 using WebKit::WebCursorInfo;
 using WebKit::WebInputEvent;
+using WebKit::WebPopupMenuInfo;
 using WebKit::WebRect;
 using WebKit::WebScreenInfo;
 using WebKit::WebSize;
 
 RenderWidget::RenderWidget(RenderThreadBase* render_thread, bool activatable)
     : routing_id_(MSG_ROUTING_NONE),
       webwidget_(NULL),
       opener_id_(MSG_ROUTING_NONE),
       render_thread_(render_thread),
       host_window_(NULL),
@@ skipping 36 matching lines @@
 RenderWidget* RenderWidget::Create(int32 opener_id,
                                    RenderThreadBase* render_thread,
                                    bool activatable) {
   DCHECK(opener_id != MSG_ROUTING_NONE);
   scoped_refptr<RenderWidget> widget = new RenderWidget(render_thread,
                                                         activatable);
   widget->Init(opener_id);  // adds reference
   return widget;
 }
 
+void RenderWidget::ConfigureAsExternalPopupMenu(const WebPopupMenuInfo& info) {
+  popup_params_.reset(new ViewHostMsg_ShowPopup_Params);
+  popup_params_->item_height = info.itemHeight;
+  popup_params_->selected_item = info.selectedIndex;
+  for (size_t i = 0; i < info.items.size(); ++i)
+    popup_params_->popup_items.push_back(WebMenuItem(info.items[i]));
+}
+
 void RenderWidget::Init(int32 opener_id) {
   DCHECK(!webwidget_);
 
   if (opener_id != MSG_ROUTING_NONE)
     opener_id_ = opener_id;
 
   webwidget_ = WebWidget::Create(this);
 
   bool result = render_thread_->Send(
       new ViewHostMsg_CreateWidget(opener_id, activatable_, &routing_id_));
@@ skipping 483 matching lines @@
                         WindowOpenDisposition disposition) {
   DCHECK(!did_show_) << "received extraneous Show call";
   DCHECK(routing_id_ != MSG_ROUTING_NONE);
   DCHECK(opener_id_ != MSG_ROUTING_NONE);
 
   if (!did_show_) {
     did_show_ = true;
     // NOTE: initial_pos_ may still have its default values at this point, but
     // that's okay.  It'll be ignored if as_popup is false, or the browser
     // process will impose a default position otherwise.
-    render_thread_->Send(new ViewHostMsg_ShowWidget(
-        opener_id_, routing_id_, initial_pos_));
+    if (popup_params_.get()) {
+      popup_params_->bounds = initial_pos_;
+      Send(new ViewHostMsg_ShowPopup(routing_id_, *popup_params_));
+      popup_params_.reset();
+    } else {
+      Send(new ViewHostMsg_ShowWidget(opener_id_, routing_id_, initial_pos_));
+    }
     SetPendingWindowRect(initial_pos_);
   }
 }
 
-void RenderWidget::ShowAsPopupWithItems(WebWidget* webwidget,
-                                        const WebRect& bounds,
-                                        int item_height,
-                                        int selected_index,
-                                        const std::vector<WebMenuItem>& items) {
-  ViewHostMsg_ShowPopup_Params params;
-  params.bounds = bounds;
-  params.item_height = item_height;
-  params.selected_item = selected_index;
-  params.popup_items = items;
-
-  Send(new ViewHostMsg_ShowPopup(routing_id_, params));
-}
-
 void RenderWidget::Focus(WebWidget* webwidget) {
   // Prevent the widget from stealing the focus if it does not have focus
   // already.  We do this by explicitely setting the focus to false again.
   // We only let the browser focus the renderer.
   if (!has_focus_ && webwidget_) {
     MessageLoop::current()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &RenderWidget::ClearFocus));
   }
 }
 
@@ skipping 228 matching lines @@
 
   if (i == plugin_window_moves_.size())
     plugin_window_moves_.push_back(move);
 }
 
 WebScreenInfo RenderWidget::GetScreenInfo(WebWidget* webwidget) {
   WebScreenInfo results;
   Send(new ViewHostMsg_GetScreenInfo(routing_id_, host_window_, &results));
   return results;
 }