Replace ShowAsPopupWithItems to CreatePopupWidgetWithInfo. Also,...

webkit/tools/test_shell/mac/test_webview_delegate.mm

 // Copyright (c) 2008 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 "webkit/tools/test_shell/test_webview_delegate.h"
 
 #import <Cocoa/Cocoa.h>
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "webkit/api/public/WebCursorInfo.h"
-#include "webkit/api/public/WebRect.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webmenurunner_mac.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebCursorInfo;
+using WebKit::WebPopupMenuInfo;
 using WebKit::WebRect;
 
 // WebViewDelegate -----------------------------------------------------------
 
 TestWebViewDelegate::~TestWebViewDelegate() {
 }
 
+WebWidget* TestWebViewDelegate::CreatePopupWidgetWithInfo(
+    WebView* webview,
+    const WebPopupMenuInfo& info) {
+  WebWidget* webwidget = shell_->CreatePopupWidget(webview);
+  popup_menu_info_.reset(new WebPopupMenuInfo(info));
+  return webwidget;
+}
+
 WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
     WebView* webview,
     const GURL& url,
     const std::string& mime_type,
     const std::string& clsid,
     std::string* actual_mime_type) {
   WebWidgetHost *host = GetHostForWidget(webview);
   if (!host)
     return NULL;
   gfx::NativeView view = host->view_handle();
@@ skipping 18 matching lines @@
                                    defaultButton:@"OK"
                                  alternateButton:nil
                                      otherButton:nil
                        informativeTextWithFormat:text];
   [alert runModal];
 }
 
 
 // WebWidgetDelegate ---------------------------------------------------------
 
-void TestWebViewDelegate::Show(WebWidget* webview,
+void TestWebViewDelegate::Show(WebWidget* webwidget,
                                WindowOpenDisposition disposition) {
-}
+  if (!popup_menu_info_.get())
+    return;
+  if (webwidget != shell_->popup())
+    return;
+  // Display a HTML select menu.
 
-// Display a HTML select menu.
-void TestWebViewDelegate::ShowAsPopupWithItems(
-    WebWidget* webview,
-    const WebRect& bounds,
-    int item_height,
-    int selected_index,
-    const std::vector<WebMenuItem>& items) {
+  std::vector<WebMenuItem> items;
+  for (size_t i = 0; i < popup_menu_info_->items.size(); ++i)
+    items.push_back(popup_menu_info_->items[i]);
+
+  int item_height = popup_menu_info_->itemHeight;
+  int selected_index = popup_menu_info_->selectedIndex;
+  popup_menu_info_.reset();  // No longer needed.
+
+  const WebRect& bounds = popup_bounds_;
+
   // Set up the menu position.
   NSView* web_view = shell_->webViewWnd();
   NSRect view_rect = [web_view bounds];
   int y_offset = bounds.y + bounds.height;
   NSRect position = NSMakeRect(bounds.x, view_rect.size.height - y_offset,
                                bounds.width, bounds.height);
 
   // Display the menu.
   scoped_nsobject<WebMenuRunner> menu_runner;
   menu_runner.reset([[WebMenuRunner alloc] initWithItems:items]);
@@ skipping 53 matching lines @@
     *out_rect = gfx::Rect(NSRectToCGRect(rect));
   }
 }
 
 void TestWebViewDelegate::SetWindowRect(WebWidget* webwidget,
                                         const WebRect& rect) {
   // TODO: Mac window movement
   if (webwidget == shell_->webView()) {
     // ignored
   } else if (webwidget == shell_->popup()) {
-    // MoveWindow(shell_->popupWnd(),
-    //            rect.x(), rect.y(), rect.width(), rect.height(), FALSE);
+    popup_bounds_ = rect;  // The initial position of the popup.
   }
 }
 
 void TestWebViewDelegate::GetRootWindowRect(WebWidget* webwidget,
                                             WebRect* out_rect) {
   if (WebWidgetHost* host = GetHostForWidget(webwidget)) {
     NSView *view = host->view_handle();
     NSRect rect = [[[view window] contentView] frame];
     *out_rect = gfx::Rect(NSRectToCGRect(rect));
   }
@@ skipping 45 matching lines @@
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   [[shell_->webViewHost()->view_handle() window]
       setTitle:[NSString stringWithUTF8String:WideToUTF8(title).c_str()]];
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   const char* frameURL = url.spec().c_str();
   NSString *address = [NSString stringWithUTF8String:frameURL];
   [shell_->editWnd() setStringValue:address];
 }