Merge in the WebKit popup menu changes.

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

Index: third_party/WebKit/WebCore/page/chromium/ChromeClientChromium.h
===================================================================
--- third_party/WebKit/WebCore/page/chromium/ChromeClientChromium.h	(revision 13377)
+++ third_party/WebKit/WebCore/page/chromium/ChromeClientChromium.h	(working copy)
@@ -35,8 +35,8 @@
 #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.
@@ -44,7 +44,10 @@
     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