Merge 248707 "Figure out the display name for a content uri."

ui/shell_dialogs/select_file_dialog_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 "select_file_dialog_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "jni/SelectFileDialog_jni.h"
 #include "ui/base/android/window_android.h"
+#include "ui/shell_dialogs/selected_file_info.h"
 
 namespace ui {
 
 // static
 SelectFileDialogImpl* SelectFileDialogImpl::Create(Listener* listener,
                                                    SelectFilePolicy* policy) {
   return new SelectFileDialogImpl(listener, policy);
 }
 
 void SelectFileDialogImpl::OnFileSelected(JNIEnv* env,
                                           jobject java_object,
-                                          jstring filepath) {
+                                          jstring filepath,
+                                          jstring display_name) {
   if (listener_) {
     std::string path = base::android::ConvertJavaStringToUTF8(env, filepath);
-    listener_->FileSelected(base::FilePath(path), 0, NULL);
+    std::string file_name =
+        base::android::ConvertJavaStringToUTF8(env, display_name);
+    base::FilePath file_path = base::FilePath(path);
+    ui::SelectedFileInfo file_info;
+    file_info.file_path = file_path;
+    file_info.local_path = file_path;
+    if (!file_name.empty())
+      file_info.display_name = file_name;
+    listener_->FileSelectedWithExtraInfo(file_info, 0, NULL);
   }
 
   is_running_ = false;
 }
 
 void SelectFileDialogImpl::OnFileNotSelected(
     JNIEnv* env,
     jobject java_object) {
   if (listener_)
     listener_->FileSelectionCanceled(NULL);
@@ skipping 60 matching lines @@
   return false;
 }
 
 SelectFileDialog* CreateAndroidSelectFileDialog(
     SelectFileDialog::Listener* listener,
     SelectFilePolicy* policy) {
   return SelectFileDialogImpl::Create(listener, policy);
 }
 
 }  // namespace ui