Files.app: Clean the callback of ConvertSelectedFileInfoListTofileChooserFileInfoList.
Previously ConvertSelectedFileInfoListTofileChooserFileInfoList passes the
result by using scoped_ptr, but it does not need to. The CL cleans the function
signature and removed unused wrapper function in FileSelectHelper.
BUG=126902
TEST=None
Review URL: https://codereview.chromium.org/673603003
Cr-Commit-Position: refs/heads/master@{#300856}
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc
index 4fd3f2e..37f85fb 100644
--- a/chrome/browser/file_select_helper.cc
+++ b/chrome/browser/file_select_helper.cc
@@ -249,7 +249,7 @@
web_contents_->GetSiteInstance()->GetSiteURL(),
files,
base::Bind(
- &FileSelectHelper::ProcessSelectedFilesChromeOSAfterConversion,
+ &FileSelectHelper::NotifyRenderViewHostAndEndAfterConversion,
this));
return;
}
@@ -262,26 +262,19 @@
chooser_file.display_name = file.display_name;
chooser_files.push_back(chooser_file);
}
- render_view_host_->FilesSelectedInChooser(chooser_files, dialog_mode_);
+
+ NotifyRenderViewHostAndEndAfterConversion(chooser_files);
+}
+
+void FileSelectHelper::NotifyRenderViewHostAndEndAfterConversion(
+ const std::vector<content::FileChooserFileInfo>& list) {
+ if (render_view_host_)
+ render_view_host_->FilesSelectedInChooser(list, 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,
