Move file chooser from RenderView(Host) to RenderFrame(Host).

content/browser/web_contents/web_contents_impl.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_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 712 matching lines @@
   if (!render_frame_message_source_) {
     DCHECK(render_view_message_source_);
     bad_message::ReceivedBadMessage(GetRenderProcessHost(),
                                     bad_message::WC_INVALID_FRAME_SOURCE);
     return false;
   }
 
   return true;
 }
 
-void WebContentsImpl::RunFileChooser(
-    RenderViewHost* render_view_host,
-    const FileChooserParams& params) {
-  if (delegate_)
-    delegate_->RunFileChooser(GetMainFrame(), params);
-}
-
 NavigationControllerImpl& WebContentsImpl::GetController() {
   return controller_;
 }
 
 const NavigationControllerImpl& WebContentsImpl::GetController() const {
   return controller_;
 }
 
 BrowserContext* WebContentsImpl::GetBrowserContext() const {
   return controller_.GetBrowserContext();
@@ skipping 3352 matching lines @@
   is_showing_before_unload_dialog_ = true;
   dialog_manager_ = delegate_->GetJavaScriptDialogManager(this);
   dialog_manager_->RunBeforeUnloadDialog(
       this, is_reload,
       base::Bind(&WebContentsImpl::OnDialogClosed, base::Unretained(this),
                  render_frame_host->GetProcess()->GetID(),
                  render_frame_host->GetRoutingID(), reply_msg,
                  false));
 }
 
+void WebContentsImpl::RunFileChooser(RenderFrameHost* render_frame_host,
+                                     const FileChooserParams& params) {
+  if (delegate_)
+    delegate_->RunFileChooser(render_frame_host, params);
+}
+
 WebContents* WebContentsImpl::GetAsWebContents() {
   return this;
 }
 
 double WebContentsImpl::GetPendingPageZoomLevel() {
   NavigationEntry* pending_entry = GetController().GetPendingEntry();
   if (!pending_entry)
     return HostZoomMap::GetZoomLevel(this);
 
   GURL url = pending_entry->GetURL();
@@ skipping 1008 matching lines @@
   for (RenderViewHost* render_view_host : render_view_host_set)
     render_view_host->OnWebkitPreferencesChanged();
 }
 
 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
     JavaScriptDialogManager* dialog_manager) {
   dialog_manager_ = dialog_manager;
 }
 
 }  // namespace content