Merge in the WebKit popup menu changes.

third_party/WebKit/WebCore/page/chromium/ChromeClientChromium.h

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ChromeClientChromium_h
 #define ChromeClientChromium_h
 
 #include "ChromeClient.h"
 #include <wtf/Forward.h>
 
 namespace WebCore {
-    class FramelessScrollView;
     class IntRect;
+    class PopupContainer;
 
     // Contains Chromium-specific extensions to the ChromeClient.  Only put
     // things here that don't make sense for other ports.
     class ChromeClientChromium : public ChromeClient {
     public:
         // Notifies the client of a new popup widget.  The client should place
         // and size the widget with the given bounds, relative to the screen.
-        virtual void popupOpened(FramelessScrollView* popupView, const IntRect& bounds, bool focusOnShow) = 0;
+        // If handleExternal is true, then drawing and input handling for the
+        // popup will be handled by the external embedder.
+        virtual void popupOpened(PopupContainer* popupContainer, const IntRect& bounds,
+                                 bool focusOnShow, bool handleExternal) = 0;
     };
 
 } // namespace WebCore
 
 #endif