Move external popup menus from WebViewClient to WebFrameClient, part 3/3.

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 623d8857799034f2639eaf82af87d611497dc052..bad24f781eb807d8ed24aec2075bb1ed9ac077f8 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -37,8 +37,6 @@ class TransportDIB;
 struct FrameMsg_Navigate_Params;
 
 namespace blink {
-class WebExternalPopupMenu;
-class WebExternalPopupMenuClient;
 class WebGeolocationClient;
 class WebInputEvent;
 class WebMouseEvent;
@@ -50,7 +48,6 @@ class WebSecurityOrigin;
 struct WebCompositionUnderline;
 struct WebContextMenuData;
 struct WebCursorInfo;
-struct WebPopupMenuInfo;
 }
 
 namespace gfx {
@@ -62,6 +59,7 @@ class Rect;
 namespace content {
 
 class ChildFrameCompositingHelper;
+class ExternalPopupMenu;
 class GeolocationDispatcher;
 class MediaStreamDispatcher;
 class MediaStreamImpl;
@@ -238,6 +236,10 @@ class CONTENT_EXPORT RenderFrameImpl
   // NULL.
   MediaStreamDispatcher* GetMediaStreamDispatcher();
 
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+  void DidHideExternalPopupMenu();
+#endif
+
   // IPC::Sender
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
@@ -454,8 +456,13 @@ class CONTENT_EXPORT RenderFrameImpl
   RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id);
 
  private:
+  friend class ExternalPopupMenuTest;
   friend class RenderFrameObserver;
   friend class RendererAccessibilityTest;
+  FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneTest, SelectItem);
+  FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange);
+  FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase);
+  FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate);
   FRIEND_TEST_ALL_PREFIXES(RendererAccessibilityTest,
                            AccessibilityMessagesQueueWhileSwappedOut);
   FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest,
@@ -520,7 +527,11 @@ class CONTENT_EXPORT RenderFrameImpl
   void OnSetupTransitionView(const std::string& markup);
   void OnBeginExitTransition(const std::string& css_selector);
   void OnSetAccessibilityMode(AccessibilityMode new_mode);
-#if defined(OS_MACOSX)
+#if defined(OS_ANDROID)
+  void OnSelectPopupMenuItems(bool canceled,
+                              const std::vector<int>& selected_indices);
+#elif defined(OS_MACOSX)
+  void OnSelectPopupMenuItem(int selected_index);
   void OnCopyToFindPboard();
 #endif
 
@@ -714,6 +725,11 @@ class CONTENT_EXPORT RenderFrameImpl
   // AccessibilityModeOff.
   RendererAccessibility* renderer_accessibility_;
 
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+  // The external popup for the currently showing select popup.
+  scoped_ptr<ExternalPopupMenu> external_popup_menu_;
+#endif
+
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);