Start consolidating non-port specific code to ui/base/dialogs.

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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/platform_file.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #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_params.h"
-#include "content/public/common/selected_file_info.h"
 #include "grit/generated_resources.h"
 #include "net/base/mime_util.h"
+#include "ui/base/dialogs/selected_file_info.h"
 #include "ui/base/l10n/l10n_util.h"
 
 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<content::SelectedFileInfo>& files,
+                          const std::vector<ui::SelectedFileInfo>& files,
                           SelectFileDialog::Type dialog_type) {
   const int kReadFilePermissions =
       base::PLATFORM_FILE_OPEN |
       base::PLATFORM_FILE_READ |
       base::PLATFORM_FILE_EXCLUSIVE_READ |
       base::PLATFORM_FILE_ASYNC;
 
   const int kWriteFilePermissions =
       base::PLATFORM_FILE_CREATE |
       base::PLATFORM_FILE_CREATE_ALWAYS |
       base::PLATFORM_FILE_OPEN |
       base::PLATFORM_FILE_OPEN_ALWAYS |
       base::PLATFORM_FILE_OPEN_TRUNCATED |
       base::PLATFORM_FILE_WRITE |
       base::PLATFORM_FILE_WRITE_ATTRIBUTES |
       base::PLATFORM_FILE_ASYNC;
 
   int permissions = kReadFilePermissions;
   if (dialog_type == SelectFileDialog::SELECT_SAVEAS_FILE)
     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<ui::SelectedFileInfo> ConvertToSelectedFileInfoList(
     const std::vector<FilePath>& paths) {
-  std::vector<content::SelectedFileInfo> selected_files;
+  std::vector<ui::SelectedFileInfo> selected_files;
   for (size_t i = 0; i < paths.size(); ++i) {
     selected_files.push_back(
-        content::SelectedFileInfo(paths[i], FilePath::StringType()));
+        ui::SelectedFileInfo(paths[i], FilePath::StringType()));
   }
   return selected_files;
 }
 
 }  // namespace
 
 struct FileSelectHelper::ActiveDirectoryEnumeration {
   ActiveDirectoryEnumeration() : rvh_(NULL) {}
 
   scoped_ptr<DirectoryListerDispatchDelegate> delegate_;
@@ skipping 24 matching lines @@
        iter != directory_enumerations_.end();
        ++iter) {
     iter->second->lister_.reset();
     delete iter->second;
   }
 }
 
 void FileSelectHelper::FileSelected(const FilePath& path,
                                     int index, void* params) {
   FileSelectedWithExtraInfo(
-      content::SelectedFileInfo(path, FilePath::StringType()),
+      ui::SelectedFileInfo(path, FilePath::StringType()),
       index, params);
 }
 
 void FileSelectHelper::FileSelectedWithExtraInfo(
-    const content::SelectedFileInfo& file,
+    const ui::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) {
     StartNewEnumeration(path, kFileSelectEnumerationId, render_view_host_);
     return;
   }
 
-  std::vector<content::SelectedFileInfo> files;
+  std::vector<ui::SelectedFileInfo> files;
   files.push_back(file);
   NotifyRenderViewHost(render_view_host_, files, dialog_type_);
 
   // No members should be accessed from here on.
   RunFileChooserEnd();
 }
 
 void FileSelectHelper::MultiFilesSelected(const std::vector<FilePath>& files,
                                           void* params) {
-  std::vector<content::SelectedFileInfo> selected_files =
+  std::vector<ui::SelectedFileInfo> selected_files =
       ConvertToSelectedFileInfoList(files);
   MultiFilesSelectedWithExtraInfo(selected_files, params);
 }
 
 void FileSelectHelper::MultiFilesSelectedWithExtraInfo(
-    const std::vector<content::SelectedFileInfo>& files,
+    const std::vector<ui::SelectedFileInfo>& files,
     void* params) {
   if (!files.empty())
     profile_->set_last_selected_directory(files[0].path.DirName());
   if (!render_view_host_)
     return;
 
   NotifyRenderViewHost(render_view_host_, files, dialog_type_);
 
   // No members should be accessed from here on.
   RunFileChooserEnd();
 }
 
 void FileSelectHelper::FileSelectionCanceled(void* params) {
   if (!render_view_host_)
     return;
 
   // If the user cancels choosing a file to upload we pass back an
   // empty vector.
   NotifyRenderViewHost(
-      render_view_host_, std::vector<content::SelectedFileInfo>(),
+      render_view_host_, std::vector<ui::SelectedFileInfo>(),
       dialog_type_);
 
   // No members should be accessed from here on.
   RunFileChooserEnd();
 }
 
 void FileSelectHelper::StartNewEnumeration(const FilePath& path,
                                            int request_id,
                                            RenderViewHost* render_view_host) {
   scoped_ptr<ActiveDirectoryEnumeration> entry(new ActiveDirectoryEnumeration);
@@ skipping 32 matching lines @@
   // This entry needs to be cleaned up when this function is done.
   scoped_ptr<ActiveDirectoryEnumeration> entry(directory_enumerations_[id]);
   directory_enumerations_.erase(id);
   if (!entry->rvh_)
     return;
   if (error) {
     FileSelectionCanceled(NULL);
     return;
   }
 
-  std::vector<content::SelectedFileInfo> selected_files =
+  std::vector<ui::SelectedFileInfo> selected_files =
       ConvertToSelectedFileInfoList(entry->results_);
 
   if (id == kFileSelectEnumerationId)
     NotifyRenderViewHost(entry->rvh_, selected_files, dialog_type_);
   else
     entry->rvh_->DirectoryEnumerationFinished(id, entry->results_);
 
   EnumerateDirectoryEnd();
 }
 
@@ skipping 233 matching lines @@
   // A 1 character accept type will always be invalid (either a "." in the case
   // of an extension or a "/" in the case of a MIME type).
   std::string unused;
   if (accept_type.length() <= 1 ||
       StringToLowerASCII(accept_type) != accept_type ||
       TrimWhitespaceASCII(accept_type, TRIM_ALL, &unused) != TRIM_NONE) {
     return false;
   }
   return true;
 }