Replace ShowAsPopupWithItems to CreatePopupWidgetWithInfo. Also,...

webkit/glue/chrome_client_impl.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.
 
 #ifndef WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_
 #define WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "ChromeClientChromium.h"
 MSVC_POP_WARNING();
 
 class WebViewImpl;
 
 namespace WebCore {
 class HTMLParserQuirks;
 class PopupContainer;
 class SecurityOrigin;
 struct WindowFeatures;
 }
 
 namespace WebKit {
 struct WebCursorInfo;
+struct WebPopupMenuInfo;
 }
 
 // Handles window-level notifications from WebCore on behalf of a WebView.
 class ChromeClientImpl : public WebCore::ChromeClientChromium {
  public:
   explicit ChromeClientImpl(WebViewImpl* webview);
   virtual ~ChromeClientImpl();
 
   WebViewImpl* webview() const { return webview_; }
 
@@ skipping 89 matching lines @@
                                      const WebCore::String& databaseName);
 
   virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*) { }
 
   virtual void runOpenPanel(WebCore::Frame*,
                             PassRefPtr<WebCore::FileChooser>);
   virtual bool setCursor(WebCore::PlatformCursorHandle) { return false; }
   virtual void popupOpened(WebCore::PopupContainer* popup_container,
                            const WebCore::IntRect& bounds,
                            bool activatable,
-                           bool handle_external);
-  void popupOpenedInternal(WebCore::PopupContainer* popup_container,
-                            const WebCore::IntRect& bounds,
-                            bool activatable);
+                           bool handle_externally);
 
   void SetCursor(const WebKit::WebCursorInfo& cursor);
   void SetCursorForPlugin(const WebKit::WebCursorInfo& cursor);
 
   virtual void formStateDidChange(const WebCore::Node*);
 
   virtual PassOwnPtr<WebCore::HTMLParserQuirks> createHTMLParserQuirks() { return 0; }
 
  private:
+  void GetPopupMenuInfo(WebCore::PopupContainer* popup_container,
+                        WebKit::WebPopupMenuInfo* info);
+
   WebViewImpl* webview_;  // weak pointer
   bool toolbars_visible_;
   bool statusbar_visible_;
   bool scrollbars_visible_;
   bool menubar_visible_;
   bool resizable_;
   // Set to true if the next SetCursor is to be ignored.
   bool ignore_next_set_cursor_;
 };
 
 #endif  // WEBKIT_GLUE_CHROME_CLIENT_IMPL_H_