filechooser: Add SelectedFileInfo class to pass display names to WebKit

Files on gdata are cached locally with human unreadable names like
/blah/gdata/cache/d41d8cd98f00b204e9800998ecf8427e. When these files
are selected from the file chooser for uploading from <form>,
we should pass display names, in addition to real paths, to WebKit,
so the proper names are shown in web pages, and used for uploading.

This patch simply adds SelectedFileInfo with minimal code changes.
There should be no behavior changes.
The file selection code for Chrome OS will be changed in a separate patch.

BUG=chromium-os:27222
TEST=try bots.

Review URL: https://chromiumcodereview.appspot.com/9651028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126606 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 43 insertions, 7 deletions

diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc
index 5ed79eb..2bc5b03 100644
--- a/chrome/browser/file_select_helper.cc
+++ b/chrome/browser/file_select_helper.cc
@@ -22,6 +22,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/file_chooser_params.h"
+#include "content/public/common/selected_file_info.h"
 #include "grit/generated_resources.h"
 #include "net/base/mime_util.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -39,7 +40,7 @@ namespace {
 const int kFileSelectEnumerationId = -1;
 
 void NotifyRenderViewHost(RenderViewHost* render_view_host,
-                          const std::vector<FilePath>& files,
+                          const std::vector<content::SelectedFileInfo>& files,
                           SelectFileDialog::Type dialog_type) {
   const int kReadFilePermissions =
       base::PLATFORM_FILE_OPEN |
@@ -62,8 +63,21 @@ void NotifyRenderViewHost(RenderViewHost* render_view_host,
     permissions = kWriteFilePermissions;
   render_view_host->FilesSelectedInChooser(files, permissions);
 }
+
+// Converts a list of FilePaths to a list of SelectedFileInfo, with the
+// display name field left empty.
+std::vector<content::SelectedFileInfo> ConvertToSelectedFileInfoList(
+    std::vector<FilePath> paths) {
+  std::vector<content::SelectedFileInfo> selected_files;
+  for (size_t i = 0; i < paths.size(); ++i) {
+    selected_files.push_back(
+        content::SelectedFileInfo(paths[i], FilePath::StringType()));
+  }
+  return selected_files;
 }
 
+}  // namespace
+
 struct FileSelectHelper::ActiveDirectoryEnumeration {
   ActiveDirectoryEnumeration() : rvh_(NULL) {}
 
@@ -101,9 +115,19 @@ FileSelectHelper::~FileSelectHelper() {
 
 void FileSelectHelper::FileSelected(const FilePath& path,
                                     int index, void* params) {
+  FileSelectedWithExtraInfo(
+      content::SelectedFileInfo(path, FilePath::StringType()),
+      index, params);
+}
+
+void FileSelectHelper::FileSelectedWithExtraInfo(
+    const content::SelectedFileInfo& file,
+    int index,
+    void* params) {
   if (!render_view_host_)
     return;
 
+  const FilePath& path = file.path;
   profile_->set_last_selected_directory(path.DirName());
 
   if (dialog_type_ == SelectFileDialog::SELECT_FOLDER) {
@@ -111,8 +135,8 @@ void FileSelectHelper::FileSelected(const FilePath& path,
     return;
   }
 
-  std::vector<FilePath> files;
-  files.push_back(path);
+  std::vector<content::SelectedFileInfo> files;
+  files.push_back(file);
   NotifyRenderViewHost(render_view_host_, files, dialog_type_);
 
   // No members should be accessed from here on.
@@ -121,8 +145,16 @@ void FileSelectHelper::FileSelected(const FilePath& path,
 
 void FileSelectHelper::MultiFilesSelected(const std::vector<FilePath>& files,
                                           void* params) {
+  std::vector<content::SelectedFileInfo> selected_files =
+      ConvertToSelectedFileInfoList(files);
+  MultiFilesSelectedWithExtraInfo(selected_files, params);
+}
+
+void FileSelectHelper::MultiFilesSelectedWithExtraInfo(
+    const std::vector<content::SelectedFileInfo>& files,
+    void* params) {
   if (!files.empty())
-    profile_->set_last_selected_directory(files[0].DirName());
+    profile_->set_last_selected_directory(files[0].path.DirName());
   if (!render_view_host_)
     return;
 
@@ -139,7 +171,8 @@ void FileSelectHelper::FileSelectionCanceled(void* params) {
   // If the user cancels choosing a file to upload we pass back an
   // empty vector.
   NotifyRenderViewHost(
-      render_view_host_, std::vector<FilePath>(), dialog_type_);
+      render_view_host_, std::vector<content::SelectedFileInfo>(),
+      dialog_type_);
 
   // No members should be accessed from here on.
   RunFileChooserEnd();
@@ -190,8 +223,12 @@ void FileSelectHelper::OnListDone(int id, int error) {
     FileSelectionCanceled(NULL);
     return;
   }
+
+  std::vector<content::SelectedFileInfo> selected_files =
+      ConvertToSelectedFileInfoList(entry->results_);
+
   if (id == kFileSelectEnumerationId)
-    NotifyRenderViewHost(entry->rvh_, entry->results_, dialog_type_);
+    NotifyRenderViewHost(entry->rvh_, selected_files, dialog_type_);
   else
     entry->rvh_->DirectoryEnumerationFinished(id, entry->results_);
 
@@ -402,4 +439,3 @@ void FileSelectHelper::Observe(int type,
       NOTREACHED();
   }
 }
-