Replace ShowAsPopupWithItems to CreatePopupWidgetWithInfo. Also,...

chrome/renderer/render_widget.h

 // 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.
 
 #ifndef CHROME_RENDERER_RENDER_WIDGET_H_
 #define CHROME_RENDERER_RENDER_WIDGET_H_
 
 #include <vector>
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "chrome/common/ipc_channel.h"
 #include "chrome/renderer/render_process.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 #include "webkit/api/public/WebRect.h"
 #include "webkit/glue/webwidget_delegate.h"
 #include "webkit/glue/webcursor.h"
 
 class RenderThreadBase;
+struct ViewHostMsg_ShowPopup_Params;
 struct WebPluginGeometry;
 
+namespace WebKit {
+struct WebPopupMenuInfo;
+}
+
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
 class RenderWidget : public IPC::Channel::Listener,
                      public IPC::Message::Sender,
                      virtual public WebWidgetDelegate,
                      public base::RefCounted<RenderWidget> {
  public:
   // Creates a new RenderWidget.  The opener_id is the routing ID of the
   // RenderView that this widget lives inside. The render_thread is any
   // RenderThreadBase implementation, mostly commonly RenderThread::current().
   static RenderWidget* Create(int32 opener_id,
                               RenderThreadBase* render_thread,
                               bool activatable);
 
+  // Called after Create to configure a RenderWidget to be rendered by the host
+  // as a popup menu with the given data.
+  void ConfigureAsExternalPopupMenu(const WebKit::WebPopupMenuInfo& info);
+
   // The routing ID assigned by the RenderProcess. Will be MSG_ROUTING_NONE if
   // not yet assigned a view ID, in which case, the process MUST NOT send
   // messages with this ID to the parent.
   int32 routing_id() const {
     return routing_id_;
   }
 
   // May return NULL when the window is closing.
   WebWidget* webwidget() const {
     return webwidget_;
   }
 
   // IPC::Channel::Listener
   virtual void OnMessageReceived(const IPC::Message& msg);
 
   // IPC::Message::Sender
   virtual bool Send(IPC::Message* msg);
 
   // WebWidgetDelegate
   virtual void DidInvalidateRect(WebWidget* webwidget,
                                  const WebKit::WebRect& rect);
   virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
                              const WebKit::WebRect& clip_rect);
   virtual void Show(WebWidget* webwidget, WindowOpenDisposition disposition);
-  virtual void ShowAsPopupWithItems(WebWidget* webwidget,
-                                    const WebKit::WebRect& bounds,
-                                    int item_height,
-                                    int selected_index,
-                                    const std::vector<WebMenuItem>& items);
   virtual void CloseWidgetSoon(WebWidget* webwidget);
   virtual void Focus(WebWidget* webwidget);
   virtual void Blur(WebWidget* webwidget);
   virtual void SetCursor(WebWidget* webwidget,
                          const WebKit::WebCursorInfo& cursor);
   virtual void GetWindowRect(WebWidget* webwidget, WebKit::WebRect* rect);
   virtual void SetWindowRect(WebWidget* webwidget,
                              const WebKit::WebRect& rect);
   virtual void GetRootWindowRect(WebWidget* webwidget, WebKit::WebRect* rect);
   virtual void GetRootWindowResizerRect(WebWidget* webwidget,
@@ skipping 119 matching lines @@
 
   // The position where this view should be initially shown.
   gfx::Rect initial_pos_;
 
   // The window we are embedded within.  TODO(darin): kill this.
   gfx::NativeViewId host_window_;
 
   // We store the current cursor object so we can avoid spamming SetCursor
   // messages.
   WebCursor current_cursor_;
+
   // The size of the RenderWidget.
   gfx::Size size_;
 
   // Transport DIBs that are currently in use to transfer an image to the
   // browser.
   TransportDIB* current_paint_buf_;
   TransportDIB* current_scroll_buf_;
 
   // The smallest bounding rectangle that needs to be re-painted.  This is non-
   // empty if a paint event is pending.
@@ skipping 62 matching lines @@
   std::vector<WebPluginGeometry> plugin_window_moves_;
 
   // A custom background for the widget.
   SkBitmap background_;
 
   // While we are waiting for the browser to update window sizes,
   // we track the pending size temporarily.
   int pending_window_rect_count_;
   WebKit::WebRect pending_window_rect_;
 
+  scoped_ptr<ViewHostMsg_ShowPopup_Params> popup_params_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 #endif  // CHROME_RENDERER_RENDER_WIDGET_H_