Figure out the display name for a content uri.

ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java

 // Copyright 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.
 
 package org.chromium.ui.base;
 
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.ui.R;
 
 import java.io.File;
@@ skipping 102 matching lines @@
                 File.separator + CAPTURE_IMAGE_DIRECTORY);
         if (!cameraDataDir.exists() && !cameraDataDir.mkdirs()) {
             cameraDataDir = externalDataDir;
         }
         File photoFile = new File(cameraDataDir.getAbsolutePath() +
                 File.separator + System.currentTimeMillis() + ".jpg");
         return photoFile;
     }
 
     /**
+     * @return the display name of the @code uri if present in the data base
+     *  or an empty string otherwise.
+     */
+    private String resolveFileName(Uri uri, ContentResolver contentResolver) {
+        Cursor cursor = null;
+        try {
+            cursor = contentResolver.query(uri, null, null, null, null);
+
+            if (cursor != null && cursor.getCount() >= 1) {
+                cursor.moveToFirst();
+                int index = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
+                if (index > -1) {
+                    return cursor.getString(index);
+                }
+            }
+        } finally {
+            if (cursor != null ) {
+                cursor.close();
+            }
+        }
+        return "";
+    }
+
+    /**
      * Callback method to handle the intent results and pass on the path to the native
      * SelectFileDialog.
      * @param window The window that has access to the application activity.
      * @param resultCode The result code whether the intent returned successfully.
      * @param contentResolver The content resolver used to extract the path of the selected file.
      * @param results The results of the requested intent.
      */
     @Override
     public void onIntentCompleted(WindowAndroid window, int resultCode,
             ContentResolver contentResolver, Intent results) {
         if (resultCode != Activity.RESULT_OK) {
             onFileNotSelected();
             return;
         }
 
         if (results == null) {
             // If we have a successful return but no data, then assume this is the camera returning
             // the photo that we requested.
-            nativeOnFileSelected(mNativeSelectFileDialog, mCameraOutputUri.getPath());
+            nativeOnFileSelected(mNativeSelectFileDialog, mCameraOutputUri.getPath(), "");
 
             // Broadcast to the media scanner that there's a new photo on the device so it will
             // show up right away in the gallery (rather than waiting until the next time the media
             // scanner runs).
             window.sendBroadcast(new Intent(
                     Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, mCameraOutputUri));
             return;
         }
 
-        if ("file".equals(results.getData().getScheme())) {
+        if (ContentResolver.SCHEME_FILE.equals(results.getData().getScheme())) {
             nativeOnFileSelected(mNativeSelectFileDialog,
-                    results.getData().getSchemeSpecificPart());
+                    results.getData().getSchemeSpecificPart(), "");
             return;
         }
 
-        if (results.getScheme() != null
-                && results.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
-            nativeOnFileSelected(mNativeSelectFileDialog, results.getData().toString());
+        if (ContentResolver.SCHEME_CONTENT.equals(results.getScheme())) {
+            nativeOnFileSelected(mNativeSelectFileDialog,
+                    results.getData().toString(),

[qinmin, 2014/01/31 16:17:29]

nit: align with mNativeSelectFileDialog here and below

[Miguel Garcia, 2014/01/31 16:35:48]

Done.

+                    resolveFileName(results.getData(), contentResolver));
             return;
         }
 
         onFileNotSelected();
         window.showError(R.string.opening_file_error);
     }
 
     private void onFileNotSelected() {
         nativeOnFileNotSelected(mNativeSelectFileDialog);
     }
@@ skipping 47 matching lines @@
         }
         return false;
     }
 
     @CalledByNative
     private static SelectFileDialog create(long nativeSelectFileDialog) {
         return new SelectFileDialog(nativeSelectFileDialog);
     }
 
     private native void nativeOnFileSelected(long nativeSelectFileDialogImpl,
-            String filePath);
+            String filePath, String displayName);
     private native void nativeOnFileNotSelected(long nativeSelectFileDialogImpl);
 }