| Index: ui/shell_dialogs/select_file_dialog.cc
|
| diff --git a/ui/shell_dialogs/select_file_dialog.cc b/ui/shell_dialogs/select_file_dialog.cc
|
| index 5423329ab95b5fc67f9d92aad64e65c404ee8391..9f440f9e403f071dc640df49c54b11a8c4a21f1f 100644
|
| --- a/ui/shell_dialogs/select_file_dialog.cc
|
| +++ b/ui/shell_dialogs/select_file_dialog.cc
|
| @@ -55,7 +55,7 @@ void SelectFileDialog::Listener::FileSelectedWithExtraInfo(
|
| void SelectFileDialog::Listener::MultiFilesSelectedWithExtraInfo(
|
| const std::vector<ui::SelectedFileInfo>& files,
|
| void* params) {
|
| - std::vector<FilePath> file_paths;
|
| + std::vector<base::FilePath> file_paths;
|
| for (size_t i = 0; i < files.size(); ++i)
|
| file_paths.push_back(files[i].local_path);
|
|
|
| @@ -99,14 +99,15 @@ SelectFileDialog* SelectFileDialog::Create(Listener* listener,
|
| return NULL;
|
| }
|
|
|
| -void SelectFileDialog::SelectFile(Type type,
|
| - const string16& title,
|
| - const FilePath& default_path,
|
| - const FileTypeInfo* file_types,
|
| - int file_type_index,
|
| - const FilePath::StringType& default_extension,
|
| - gfx::NativeWindow owning_window,
|
| - void* params) {
|
| +void SelectFileDialog::SelectFile(
|
| + Type type,
|
| + const string16& title,
|
| + const base::FilePath& default_path,
|
| + const FileTypeInfo* file_types,
|
| + int file_type_index,
|
| + const base::FilePath::StringType& default_extension,
|
| + gfx::NativeWindow owning_window,
|
| + void* params) {
|
| DCHECK(listener_);
|
|
|
| if (select_file_policy_.get() &&
|
|
|