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

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index db423a0eb190e2e5dbfa787f99bf8d1467f5162c..1ee20032ab13a6f156bdb6c63125878222453c77 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -25,6 +25,8 @@
 #include "content/browser/renderer_host/input/input_router.h"
 #include "content/browser/renderer_host/input/timeout_monitor.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/browser/renderer_host/render_view_host_delegate.h"
+#include "content/browser/renderer_host/render_view_host_delegate_view.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
@@ -52,6 +54,10 @@
 #include "ui/accessibility/ax_tree.h"
 #include "url/gurl.h"
 
+#if defined(OS_MACOSX)
+#include "content/browser/frame_host/popup_menu_helper_mac.h"
+#endif
+
 using base::TimeDelta;
 
 namespace content {
@@ -364,6 +370,10 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
     IPC_MESSAGE_HANDLER(AccessibilityHostMsg_Events, OnAccessibilityEvents)
     IPC_MESSAGE_HANDLER(AccessibilityHostMsg_LocationChanges,
                         OnAccessibilityLocationChanges)
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+    IPC_MESSAGE_HANDLER(FrameHostMsg_ShowPopup, OnShowPopup)
+    IPC_MESSAGE_HANDLER(FrameHostMsg_HidePopup, OnHidePopup)
+#endif
   IPC_END_MESSAGE_MAP()
 
   return handled;
@@ -998,6 +1008,31 @@ void RenderFrameHostImpl::OnAccessibilityLocationChanges(
   }
 }
 
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+void RenderFrameHostImpl::OnShowPopup(
+    const FrameHostMsg_ShowPopup_Params& params) {
+  RenderViewHostDelegateView* view =
+      render_view_host_->delegate_->GetDelegateView();

[nasko, 2014/08/25 16:54:13]

Shouldn't we be going through RenderframeHostDelegate and getting a view from
there? It feels strange to continue going through RVHD. I'm ok with putting it
in a separate CL to avoid making this one even bigger, but let's put a TODO.

Alternatively, just use the delegate only and it can forward to the view itself.

[Avi (use Gerrit), 2014/08/25 18:17:33]

This patch got big quickly, so I wanted to cut off the change dependency there.

Re a TODO, search for "render_view_host_->delegate_" in RFHI. There's plenty of
RFHI using RVHI's delegate with no notes. Everyone knows we're going to kill it.

+  if (view) {
+    view->ShowPopupMenu(this,
+                        params.bounds,
+                        params.item_height,
+                        params.item_font_size,
+                        params.selected_item,
+                        params.popup_items,
+                        params.right_aligned,
+                        params.allow_multiple_selection);
+  }
+}
+
+void RenderFrameHostImpl::OnHidePopup() {
+  RenderViewHostDelegateView* view =
+      render_view_host_->delegate_->GetDelegateView();
+  if (view)
+    view->HidePopupMenu();
+}
+#endif
+
 void RenderFrameHostImpl::SetPendingShutdown(const base::Closure& on_swap_out) {
   render_view_host_->SetPendingShutdown(on_swap_out);
 }
@@ -1208,6 +1243,28 @@ RenderFrameHostImpl::GetParentNativeViewAccessible() const {
 }
 #endif  // defined(OS_WIN)
 
+#if defined(OS_MACOSX)
+void RenderFrameHostImpl::DidSelectPopupMenuItem(int selected_index) {
+  Send(new FrameMsg_SelectPopupMenuItem(routing_id_, selected_index));
+}
+
+void RenderFrameHostImpl::DidCancelPopupMenu() {
+  Send(new FrameMsg_SelectPopupMenuItem(routing_id_, -1));
+}
+#endif

[nasko, 2014/08/25 16:54:12]

nit: You used #elif in other places, any reason not to keep that one consistent?

[Avi (use Gerrit), 2014/08/25 18:17:33]

Done.

+
+#if defined(OS_ANDROID)
+void RenderFrameHostImpl::DidSelectPopupMenuItems(
+    const std::vector<int>& selected_indices) {
+  Send(new FrameMsg_SelectPopupMenuItems(routing_id_, false, selected_indices));
+}
+
+void RenderFrameHostImpl::DidCancelPopupMenu() {
+  Send(new FrameMsg_SelectPopupMenuItems(
+      routing_id_, true, std::vector<int>()));
+}
+#endif
+
 void RenderFrameHostImpl::ClearPendingTransitionRequestData() {
   BrowserThread::PostTask(
       BrowserThread::IO,