Add non-native file handling in FileSelectorHelper class.

chrome/browser/file_select_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_FILE_SELECT_HELPER_H_
 #define CHROME_BROWSER_FILE_SELECT_HELPER_H_
 
 #include <map>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/file_chooser_params.h"
 #include "net/base/directory_lister.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 class Profile;
 
 namespace content {
+struct FileChooserFileInfo;
 class RenderViewHost;
 class WebContents;
 }
 
 namespace ui {
 struct SelectedFileInfo;
 }
 
 // This class handles file-selection requests coming from WebUI elements
 // (via the extensions::ExtensionHost class). It implements both the
@@ skipping 101 matching lines @@
   void ProcessSelectedFilesMacOnUIThread(
       const std::vector<ui::SelectedFileInfo>& files,
       const std::vector<base::FilePath>& zipped_files);
 
   // Zips the package at |path| into a temporary destination. Returns the
   // temporary destination, if the zip was successful. Otherwise returns an
   // empty path.
   static base::FilePath ZipPackage(const base::FilePath& path);
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
+#if defined(OS_CHROMEOS)
+  // Converts |files| into FileChooserFileInfo with handling non-native files.

[Avi (use Gerrit), 2014/10/16 15:21:20]

... with handling of non-native files.

[hirono, 2014/10/17 11:42:10]

Done.

+  void ProcessSelectedFilesChromeOS(
+      const std::vector<ui::SelectedFileInfo>& files);
+
+  // Passes the result to |NotifyRenderViewHostAndEnd|.
+  void ProcessSelectedFilesChromeOSAfterConvresion(

[Avi (use Gerrit), 2014/10/16 15:21:20]

...AfterConversion

[hirono, 2014/10/17 11:42:10]

Done.

+      scoped_ptr<std::vector<content::FileChooserFileInfo>> list);
+#endif  // defined(OS_CHROMEOS)
+
+  void ProcessSelectedFiles(const std::vector<ui::SelectedFileInfo>& files);

[Avi (use Gerrit), 2014/10/16 15:21:20]

Is ProcessSelectedFiles mutually exclusive with ProcessSelectedFilesChromeOS?
Would the former never be called on ChromeOS? If so, we shouldn't have two
functions but one. If not, then it's not clear which one should be called over
the other.

Where is the comment explaining the purpose here?

[hirono, 2014/10/17 11:42:10]

I combined the two function. Added a comment.

+
   // Utility method that passes |files| to the render view host, and ends the
   // file chooser.

[Avi (use Gerrit), 2014/10/16 15:21:20]

Is this no longer supposed to be called? It seems like you've moved callers to
ProcessSelectedFiles, so when is this now supposed to be called? Move this to
the private section if it's no longer supposed to be called from the outside.

[hirono, 2014/10/17 11:42:10]

Done.

   void NotifyRenderViewHostAndEnd(
-      const std::vector<ui::SelectedFileInfo>& files);
+      const std::vector<content::FileChooserFileInfo>& files);
 
   // Schedules the deletion of the files in |temporary_files_| and clears the
   // vector.
   void DeleteTemporaryFiles();
 
   // Helper method to get allowed extensions for select file dialog from
   // the specified accept types as defined in the spec:
   //   http://whatwg.org/html/number-state.html#attr-input-accept
   // |accept_types| contains only valid lowercased MIME types or file extensions
   // beginning with a period (.).
@@ skipping 33 matching lines @@
   content::NotificationRegistrar notification_registrar_;
 
   // Temporary files only used on OSX. This class is responsible for deleting
   // these files when they are no longer needed.
   std::vector<base::FilePath> temporary_files_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSelectHelper);
 };
 
 #endif  // CHROME_BROWSER_FILE_SELECT_HELPER_H_