Add non-native file handling in FileSelectorHelper class.

chrome/browser/file_select_helper.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 "chrome/browser/file_select_helper.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
 #include "net/base/mime_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/file_manager/fileapi_util.h"
+#include "content/public/browser/site_instance.h"
+#endif
+
 using content::BrowserThread;
 using content::FileChooserParams;
 using content::RenderViewHost;
 using content::RenderWidgetHost;
 using content::WebContents;
 
 namespace {
 
 // There is only one file-selection happening at any given time,
 // so we allocate an enumeration ID for that purpose.  All IDs from
 // the renderer must start at 0 and increase.
 const int kFileSelectEnumerationId = -1;
 
-void NotifyRenderViewHost(
-    RenderViewHost* render_view_host,
-    const std::vector<ui::SelectedFileInfo>& files,
-    FileChooserParams::Mode dialog_mode) {
-  std::vector<content::FileChooserFileInfo> chooser_files;
-  for (size_t i = 0; i < files.size(); ++i) {
-    content::FileChooserFileInfo chooser_file;
-    chooser_file.file_path = files[i].local_path;
-    chooser_file.display_name = files[i].display_name;
-    chooser_files.push_back(chooser_file);
-  }
-  render_view_host->FilesSelectedInChooser(chooser_files, dialog_mode);
-}
-
 // Converts a list of FilePaths to a list of ui::SelectedFileInfo.
 std::vector<ui::SelectedFileInfo> FilePathListToSelectedFileInfoList(
     const std::vector<base::FilePath>& paths) {
   std::vector<ui::SelectedFileInfo> selected_files;
   for (size_t i = 0; i < paths.size(); ++i) {
     selected_files.push_back(
         ui::SelectedFileInfo(paths[i], paths[i]));
   }
   return selected_files;
 }
@@ skipping 154 matching lines @@
   if (!entry->rvh_)
     return;
   if (error) {
     FileSelectionCanceled(NULL);
     return;
   }
 
   std::vector<ui::SelectedFileInfo> selected_files =
       FilePathListToSelectedFileInfoList(entry->results_);
 
-  if (id == kFileSelectEnumerationId)
-    NotifyRenderViewHost(entry->rvh_, selected_files, dialog_mode_);
-  else
+  if (id == kFileSelectEnumerationId) {
+    NotifyRenderViewHostAndEnd(selected_files);
+  } else {
     entry->rvh_->DirectoryEnumerationFinished(id, entry->results_);
-
-  EnumerateDirectoryEnd();
+    EnumerateDirectoryEnd();
+  }
 }
 
 void FileSelectHelper::NotifyRenderViewHostAndEnd(
     const std::vector<ui::SelectedFileInfo>& files) {
-  if (render_view_host_)
-    NotifyRenderViewHost(render_view_host_, files, dialog_mode_);
+  std::vector<content::FileChooserFileInfo> chooser_files;
+
+  if (!render_view_host_) {
+    RunFileChooserEnd();
+    return;
+  }
+
+#if defined(OS_CHROMEOS)
+  if (!files.empty()) {
+    // Converts |files| into FileChooserFileInfo with handling of non-native
+    // files.
+    file_manager::util::ConvertSelectedFileInfoListToFileChooserFileInfoList(
+        file_manager::util::GetFileSystemContextForRenderViewHost(
+            profile_, render_view_host_),
+        web_contents_->GetSiteInstance()->GetSiteURL(),
+        files,
+        base::Bind(
+            &FileSelectHelper::ProcessSelectedFilesChromeOSAfterConversion,
+            this));
+    return;
+  }
+#endif  // defined(OS_CHROMEOS)
+
+  for (size_t i = 0; i < files.size(); ++i) {
+    chooser_files[i].file_path = files[i].local_path;
+    chooser_files[i].display_name = files[i].display_name;

[Avi (use Gerrit), 2014/10/17 19:38:52]

How does this work? chooser_files starts empty, and you seem to be addressing
non-existent elements here. The old NotifyRenderViewHost used push_back; you
will need to as well.

Plus, you could use for ( : ):

for (auto& file : files) {
  content::FileChooserFileInfo chooser_file;	
  chooser_file.file_path = file.local_path;	
  chooser_file.display_name = file.display_name;	
  chooser_files.push_back(chooser_file);
}

[hirono, 2014/10/20 04:10:48]

Yes, this was completely wrong...
Fixed.

+  }
+  render_view_host_->FilesSelectedInChooser(chooser_files, dialog_mode_);
 
   // No members should be accessed from here on.
   RunFileChooserEnd();
 }
 
+#if defined(OS_CHROMEOS)
+void FileSelectHelper::ProcessSelectedFilesChromeOSAfterConversion(
+    scoped_ptr<std::vector<content::FileChooserFileInfo>> list) {
+  if (render_view_host_) {
+    render_view_host_->FilesSelectedInChooser(
+        list ? *list : std::vector<content::FileChooserFileInfo>(),
+        dialog_mode_);
+  }
+
+  // No members should be accessed from here on.
+  RunFileChooserEnd();
+}
+#endif  // defined(OS_CHROMEOS)
+
 void FileSelectHelper::DeleteTemporaryFiles() {
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,
                           base::Bind(&DeleteFiles, temporary_files_));
   temporary_files_.clear();
 }
 
 scoped_ptr<ui::SelectFileDialog::FileTypeInfo>
 FileSelectHelper::GetFileTypesFromAcceptType(
     const std::vector<base::string16>& accept_types) {
@@ skipping 265 matching lines @@
   // of an extension or a "/" in the case of a MIME type).
   std::string unused;
   if (accept_type.length() <= 1 ||
       base::StringToLowerASCII(accept_type) != accept_type ||
       base::TrimWhitespaceASCII(accept_type, base::TRIM_ALL, &unused) !=
           base::TRIM_NONE) {
     return false;
   }
   return true;
 }