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

ui/shell_dialogs/select_file_dialog_android.h

 // Copyright (c) 2013 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.
 
 #ifndef UI_SHELL_DIALOGS_ANDROID_SELECT_FILE_DIALOG_ANDROID_H_
 #define UI_SHELL_DIALOGS_ANDROID_SELECT_FILE_DIALOG_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/files/file_path.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 namespace ui {
 
 class SelectFileDialogImpl : public SelectFileDialog {
  public:
   static SelectFileDialogImpl* Create(Listener* listener,
                                       SelectFilePolicy* policy);
 
-  void OnFileSelected(JNIEnv* env, jobject java_object, jstring filepath);
+  void OnFileSelected(JNIEnv* env,
+                      jobject java_object,
+                      jstring filepath,
+                      jstring display_name);
   void OnFileNotSelected(JNIEnv* env, jobject java_object);
 
   // From SelectFileDialog
   virtual bool IsRunning(gfx::NativeWindow) const OVERRIDE;
   virtual void ListenerDestroyed() OVERRIDE;
 
   // Called when it is time to display the file picker.
   // params is expected to be a vector<string16> with accept_types first and
   // the capture value as the last element of the vector.
   virtual void SelectFileImpl(
@@ skipping 25 matching lines @@
 };
 
 SelectFileDialog* CreateAndroidSelectFileDialog(
     SelectFileDialog::Listener* listener,
     SelectFilePolicy* policy);
 
 }  // namespace ui
 
 #endif  // UI_SHELL_DIALOGS_ANDROID_SELECT_FILE_DIALOG_ANDROID_H_