Replace ShowAsPopupWithItems to CreatePopupWidgetWithInfo. Also,...

webkit/tools/test_shell/test_webview_delegate.h

 // Copyright (c) 2006-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.
 
 // TestWebViewDelegate class:
 // This class implements the WebViewDelegate methods for the test shell.  One
 // instance is owned by each TestShell.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 #include <map>
 
 #if defined(OS_LINUX)
 #include <gdk/gdkcursor.h>
 #endif
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#if defined(OS_MACOSX)
+#include "webkit/api/public/WebRect.h"
+#include "webkit/api/public/WebPopupMenuInfo.h"
+#endif
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webwidget_delegate.h"
 #if defined(OS_WIN)
 #include "webkit/tools/test_shell/drag_delegate.h"
 #include "webkit/tools/test_shell/drop_delegate.h"
 #endif
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 
 struct WebPreferences;
@@ skipping 39 matching lines @@
 #endif
       {
   }
   virtual ~TestWebViewDelegate();
 
   // WebViewDelegate
   virtual WebView* CreateWebView(WebView* webview,
                                  bool user_gesture,
                                  const GURL& creator_url);
   virtual WebWidget* CreatePopupWidget(WebView* webview, bool activatable);
+#if defined(OS_MACOSX)
+  virtual WebWidget* CreatePopupWidgetWithInfo(
+      WebView* webview,
+      const WebKit::WebPopupMenuInfo& info);
+#endif
   virtual WebPluginDelegate* CreatePluginDelegate(
-    WebView* webview,
-    const GURL& url,
-    const std::string& mime_type,
-    const std::string& clsid,
-    std::string* actual_mime_type);
+      WebView* webview,
+      const GURL& url,
+      const std::string& mime_type,
+      const std::string& clsid,
+      std::string* actual_mime_type);
 #if defined(OS_LINUX)
   virtual gfx::PluginWindowHandle CreatePluginContainer();
   virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle);
 #endif
   virtual WebKit::WebMediaPlayer* CreateWebMediaPlayer(
       WebKit::WebMediaPlayerClient* client);
   virtual WebKit::WebWorker* CreateWebWorker(WebKit::WebWorkerClient* client);
   virtual void OpenURL(WebView* webview,
                        const GURL& url,
                        const GURL& referrer,
@@ skipping 119 matching lines @@
   virtual void NavigateBackForwardSoon(int offset);
   virtual int GetHistoryBackListCount();
   virtual int GetHistoryForwardListCount();
 
   // 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* webview, 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 *, WebKit::WebRect *);
   virtual void GetRootWindowResizerRect(WebWidget* webwidget,
@@ skipping 95 matching lines @@
   typedef std::map<uint32, std::string> ResourceMap;
   ResourceMap resource_identifier_map_;
   std::string GetResourceDescription(uint32 identifier);
 
   // true if we want to enable smart insert/delete.
   bool smart_insert_delete_enabled_;
 
   // true if we want to enable selection of trailing whitespaces
   bool select_trailing_whitespace_enabled_;
 
+  CapturedContextMenuEvents captured_context_menu_events_;
+
   WebCursor current_cursor_;
+
 #if defined(OS_WIN)
   // Classes needed by drag and drop.
   scoped_refptr<TestDragDelegate> drag_delegate_;
   scoped_refptr<TestDropDelegate> drop_delegate_;
 #endif
 
 #if defined(OS_LINUX)
   // The type of cursor the window is currently using.
   // Used for judging whether a new SetCursor call is actually changing the
   // cursor.
   GdkCursorType cursor_type_;
 #endif
 
-  CapturedContextMenuEvents captured_context_menu_events_;
+#if defined(OS_MACOSX)
+  scoped_ptr<WebKit::WebPopupMenuInfo> popup_menu_info_;
+  WebKit::WebRect popup_bounds_;
+#endif
 
   DISALLOW_COPY_AND_ASSIGN(TestWebViewDelegate);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_