Change WebContentsDelegate::RunFileChooser to be frame based.

android_webview/native/aw_web_contents_delegate.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 "android_webview/native/aw_web_contents_delegate.h"
 
 #include "android_webview/browser/aw_javascript_dialog_manager.h"
 #include "android_webview/browser/find_helper.h"
 #include "android_webview/native/aw_contents.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "android_webview/native/permission/media_access_permission_request.h"
 #include "android_webview/native/permission/permission_request_handler.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/common/media_stream_request.h"
 #include "jni/AwWebContentsDelegate_jni.h"
 #include "net/base/escape.h"
 
@@ skipping 51 matching lines @@
 void AwWebContentsDelegate::CanDownload(
     const GURL& url,
     const std::string& request_method,
     const base::Callback<void(bool)>& callback) {
   // Android webview intercepts download in its resource dispatcher host
   // delegate, so should not reach here.
   NOTREACHED();
   callback.Run(false);
 }
 
-void AwWebContentsDelegate::RunFileChooser(WebContents* web_contents,
-                                           const FileChooserParams& params) {
+void AwWebContentsDelegate::RunFileChooser(
+    content::RenderFrameHost* render_frame_host,
+    const FileChooserParams& params) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_delegate = GetJavaDelegate(env);
   if (!java_delegate.obj())
     return;
 
   int mode_flags = 0;
   if (params.mode == FileChooserParams::OpenMultiple) {
     mode_flags |= kFileChooserModeOpenMultiple;
   } else if (params.mode == FileChooserParams::UploadFolder) {
     // Folder implies multiple in Chrome.
     mode_flags |= kFileChooserModeOpenMultiple | kFileChooserModeOpenFolder;
   } else if (params.mode == FileChooserParams::Save) {
     // Save not supported, so cancel it.
-    web_contents->GetRenderViewHost()->FilesSelectedInChooser(
-         std::vector<content::FileChooserFileInfo>(),
-         params.mode);
+    render_frame_host->FilesSelectedInChooser(
+        std::vector<content::FileChooserFileInfo>(), params.mode);
     return;
   } else {
     DCHECK_EQ(FileChooserParams::Open, params.mode);
   }
-  Java_AwWebContentsDelegate_runFileChooser(env,
-      java_delegate.obj(),
-      web_contents->GetRenderProcessHost()->GetID(),
-      web_contents->GetRenderViewHost()->GetRoutingID(),
-      mode_flags,
-      ConvertUTF16ToJavaString(env,
-          base::JoinString(params.accept_types, base::ASCIIToUTF16(","))).obj(),
-      params.title.empty() ? NULL :
-          ConvertUTF16ToJavaString(env, params.title).obj(),
-      params.default_file_name.empty() ? NULL :
-          ConvertUTF8ToJavaString(env, params.default_file_name.value()).obj(),
+  Java_AwWebContentsDelegate_runFileChooser(
+      env, java_delegate.obj(), render_frame_host->GetProcess()->GetID(),
+      render_frame_host->GetRoutingID(), mode_flags,
+      ConvertUTF16ToJavaString(
+          env, base::JoinString(params.accept_types, base::ASCIIToUTF16(",")))
+          .obj(),
+      params.title.empty() ? NULL
+                           : ConvertUTF16ToJavaString(env, params.title).obj(),
+      params.default_file_name.empty()
+          ? NULL
+          : ConvertUTF8ToJavaString(env, params.default_file_name.value())
+                .obj(),
       params.capture);
 }
 
 void AwWebContentsDelegate::AddNewContents(WebContents* source,
                                            WebContents* new_contents,
                                            WindowOpenDisposition disposition,
                                            const gfx::Rect& initial_rect,
                                            bool user_gesture,
                                            bool* was_blocked) {
   JNIEnv* env = AttachCurrentThread();
@@ skipping 127 matching lines @@
 }
 
 static void FilesSelectedInChooser(
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz,
     jint process_id,
     jint render_id,
     jint mode_flags,
     const JavaParamRef<jobjectArray>& file_paths,
     const JavaParamRef<jobjectArray>& display_names) {
-  content::RenderViewHost* rvh = content::RenderViewHost::FromID(process_id,
-                                                                 render_id);
-  if (!rvh)
+  content::RenderFrameHost* rfh =
+      content::RenderFrameHost::FromID(process_id, render_id);
+  if (!rfh)
     return;
 
   std::vector<std::string> file_path_str;
   std::vector<std::string> display_name_str;
   // Note file_paths maybe NULL, but this will just yield a zero-length vector.
   base::android::AppendJavaStringArrayToStringVector(env, file_paths,
                                                      &file_path_str);
   base::android::AppendJavaStringArrayToStringVector(env, display_names,
                                                      &display_name_str);
   std::vector<content::FileChooserFileInfo> files;
@@ skipping 16 matching lines @@
   FileChooserParams::Mode mode;
   if (mode_flags & kFileChooserModeOpenFolder) {
     mode = FileChooserParams::UploadFolder;
   } else if (mode_flags & kFileChooserModeOpenMultiple) {
     mode = FileChooserParams::OpenMultiple;
   } else {
     mode = FileChooserParams::Open;
   }
   DVLOG(0) << "File Chooser result: mode = " << mode
            << ", file paths = " << base::JoinString(file_path_str, ":");
-  rvh->FilesSelectedInChooser(files, mode);
+  rfh->FilesSelectedInChooser(files, mode);
 }
 
 bool RegisterAwWebContentsDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview