Remove redirection header and add "ui::" before all SelectFileDialog usage.

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"
@@ skipping 26 matching lines @@
 
 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,
-                          SelectFileDialog::Type dialog_type) {
+                          ui::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)
+  if (dialog_type == ui::SelectFileDialog::SELECT_SAVEAS_FILE)
     permissions = kWriteFilePermissions;
   render_view_host->FilesSelectedInChooser(files, permissions);
 }
 
 // Converts a list of FilePaths to a list of ui::SelectedFileInfo.
 std::vector<ui::SelectedFileInfo> FilePathListToSelectedFileInfoList(
     const std::vector<FilePath>& paths) {
   std::vector<ui::SelectedFileInfo> selected_files;
   for (size_t i = 0; i < paths.size(); ++i) {
     selected_files.push_back(
@@ skipping 12 matching lines @@
   RenderViewHost* rvh_;
   std::vector<FilePath> results_;
 };
 
 FileSelectHelper::FileSelectHelper(Profile* profile)
     : profile_(profile),
       render_view_host_(NULL),
       web_contents_(NULL),
       select_file_dialog_(),
       select_file_types_(),
-      dialog_type_(SelectFileDialog::SELECT_OPEN_FILE) {
+      dialog_type_(ui::SelectFileDialog::SELECT_OPEN_FILE) {
 }
 
 FileSelectHelper::~FileSelectHelper() {
   // There may be pending file dialogs, we need to tell them that we've gone
   // away so they don't try and call back to us.
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
 
   // Stop any pending directory enumeration, prevent a callback, and free
   // allocated memory.
@@ skipping 14 matching lines @@
 void FileSelectHelper::FileSelectedWithExtraInfo(
     const ui::SelectedFileInfo& file,
     int index,
     void* params) {
   if (!render_view_host_)
     return;
 
   profile_->set_last_selected_directory(file.file_path.DirName());
 
   const FilePath& path = file.local_path;
-  if (dialog_type_ == SelectFileDialog::SELECT_FOLDER) {
+  if (dialog_type_ == ui::SelectFileDialog::SELECT_FOLDER) {
     StartNewEnumeration(path, kFileSelectEnumerationId, render_view_host_);
     return;
   }
 
   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();
@@ skipping 85 matching lines @@
       FilePathListToSelectedFileInfoList(entry->results_);
 
   if (id == kFileSelectEnumerationId)
     NotifyRenderViewHost(entry->rvh_, selected_files, dialog_type_);
   else
     entry->rvh_->DirectoryEnumerationFinished(id, entry->results_);
 
   EnumerateDirectoryEnd();
 }
 
-SelectFileDialog::FileTypeInfo* FileSelectHelper::GetFileTypesFromAcceptType(
+ui::SelectFileDialog::FileTypeInfo*
+FileSelectHelper::GetFileTypesFromAcceptType(
     const std::vector<string16>& accept_types) {
   if (accept_types.empty())
     return NULL;
 
   // Create FileTypeInfo and pre-allocate for the first extension list.
-  scoped_ptr<SelectFileDialog::FileTypeInfo> file_type(
-      new SelectFileDialog::FileTypeInfo());
+  scoped_ptr<ui::SelectFileDialog::FileTypeInfo> file_type(
+      new ui::SelectFileDialog::FileTypeInfo());
   file_type->include_all_files = true;
   file_type->extensions.resize(1);
   std::vector<FilePath::StringType>* extensions = &file_type->extensions.back();
 
   // Find the corresponding extensions.
   int valid_type_count = 0;
   int description_id = 0;
   for (size_t i = 0; i < accept_types.size(); ++i) {
     std::string ascii_type = UTF16ToASCII(accept_types[i]);
     if (!IsAcceptTypeValid(ascii_type))
@@ skipping 106 matching lines @@
 
 void FileSelectHelper::RunFileChooserOnUIThread(
     const FileChooserParams& params) {
   if (!render_view_host_ || !web_contents_) {
     // If the renderer was destroyed before we started, just cancel the
     // operation.
     RunFileChooserEnd();
     return;
   }
 
-  select_file_dialog_ = SelectFileDialog::Create(
+  select_file_dialog_ = ui::SelectFileDialog::Create(
       this, new ChromeSelectFilePolicy(web_contents_));
 
   switch (params.mode) {
     case FileChooserParams::Open:
-      dialog_type_ = SelectFileDialog::SELECT_OPEN_FILE;
+      dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_FILE;
       break;
     case FileChooserParams::OpenMultiple:
-      dialog_type_ = SelectFileDialog::SELECT_OPEN_MULTI_FILE;
+      dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_MULTI_FILE;
       break;
     case FileChooserParams::OpenFolder:
-      dialog_type_ = SelectFileDialog::SELECT_FOLDER;
+      dialog_type_ = ui::SelectFileDialog::SELECT_FOLDER;
       break;
     case FileChooserParams::Save:
-      dialog_type_ = SelectFileDialog::SELECT_SAVEAS_FILE;
+      dialog_type_ = ui::SelectFileDialog::SELECT_SAVEAS_FILE;
       break;
     default:
-      dialog_type_ = SelectFileDialog::SELECT_OPEN_FILE;  // Prevent warning.
+      // Prevent warning.
+      dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_FILE;
       NOTREACHED();
   }
   FilePath default_file_name = params.default_file_name;
   if (default_file_name.empty())
     default_file_name = profile_->last_selected_directory();
 
   gfx::NativeWindow owning_window =
       platform_util::GetTopLevel(render_view_host_->GetView()->GetNativeView());
 
   select_file_dialog_->SelectFile(
@@ skipping 70 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;
 }