Pass display names for uploaded content URI files

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"
@@ skipping 212 matching lines @@
 
 bool AwWebContentsDelegate::IsFullscreenForTabOrPending(
     const content::WebContents* web_contents) const {
   return is_fullscreen_;
 }
 
 
 static void FilesSelectedInChooser(
     JNIEnv* env, jclass clazz,
     jint process_id, jint render_id, jint mode_flags,
-    jobjectArray file_paths) {
+    jobjectArray file_paths, jobjectArray display_names) {
   content::RenderViewHost* rvh = content::RenderViewHost::FromID(process_id,
                                                                  render_id);
   if (!rvh)
     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<ui::SelectedFileInfo> files;
   files.reserve(file_path_str.size());
   for (size_t i = 0; i < file_path_str.size(); ++i) {
     GURL url(file_path_str[i]);
     if (!url.is_valid())
       continue;
     base::FilePath path(url.SchemeIsFile() ? url.path() : file_path_str[i]);
-    files.push_back(ui::SelectedFileInfo(path, base::FilePath()));
+    ui::SelectedFileInfo file_info(path, base::FilePath());
+    if (!display_name_str[i].empty())
+      file_info.display_name = display_name_str[i];
+    files.push_back(file_info);
   }
   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 = " << JoinString(file_path_str, ":");
   rvh->FilesSelectedInChooser(files, mode);
 }
 
 bool RegisterAwWebContentsDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview