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

content/browser/web_contents/web_contents_view_android.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/web_contents/web_contents_view_android.h"
 
 #include "base/logging.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
@@ skipping 145 matching lines @@
 void WebContentsViewAndroid::SetOverscrollControllerEnabled(bool enabled) {
 }
 
 void WebContentsViewAndroid::ShowContextMenu(
     RenderFrameHost* render_frame_host, const ContextMenuParams& params) {
   if (delegate_)
     delegate_->ShowContextMenu(render_frame_host, params);
 }
 
 void WebContentsViewAndroid::ShowPopupMenu(
+    RenderFrameHost* render_frame_host,
     const gfx::Rect& bounds,
     int item_height,
     double item_font_size,
     int selected_item,
     const std::vector<MenuItem>& items,
     bool right_aligned,
     bool allow_multiple_selection) {
   if (content_view_core_) {
-    content_view_core_->ShowSelectPopupMenu(
-        bounds, items, selected_item, allow_multiple_selection);
+    content_view_core_->ShowSelectPopupMenu(render_frame_host,
+                                            bounds,
+                                            items,
+                                            selected_item,
+                                            allow_multiple_selection);
   }
 }
 
 void WebContentsViewAndroid::HidePopupMenu() {
   if (content_view_core_)
     content_view_core_->HideSelectPopupMenu();
 }
 
 void WebContentsViewAndroid::StartDragging(
     const DropData& drop_data,
@@ skipping 16 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content