OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/extensions/api/file_system/file_system_api.h" | 5 #include "chrome/browser/extensions/api/file_system/file_system_api.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 &FileSystemChooseEntryFunction::FilePicker:: | 428 &FileSystemChooseEntryFunction::FilePicker:: |
429 FileSelectionCanceled, | 429 FileSelectionCanceled, |
430 base::Unretained(this), static_cast<void*>(NULL))); | 430 base::Unretained(this), static_cast<void*>(NULL))); |
431 } | 431 } |
432 return; | 432 return; |
433 } | 433 } |
434 | 434 |
435 select_file_dialog_->SelectFile(picker_type, | 435 select_file_dialog_->SelectFile(picker_type, |
436 string16(), | 436 string16(), |
437 suggested_name, | 437 suggested_name, |
438 &file_type_info, 0, FILE_PATH_LITERAL(""), | 438 &file_type_info, |
439 owning_window, NULL); | 439 0, |
| 440 base::FilePath::StringType(), |
| 441 owning_window, |
| 442 NULL); |
440 } | 443 } |
441 | 444 |
442 virtual ~FilePicker() {} | 445 virtual ~FilePicker() {} |
443 | 446 |
444 private: | 447 private: |
445 // ui::SelectFileDialog::Listener implementation. | 448 // ui::SelectFileDialog::Listener implementation. |
446 virtual void FileSelected(const base::FilePath& path, | 449 virtual void FileSelected(const base::FilePath& path, |
447 int index, | 450 int index, |
448 void* params) OVERRIDE { | 451 void* params) OVERRIDE { |
449 function_->FileSelected(path, entry_type_); | 452 function_->FileSelected(path, entry_type_); |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
652 if (entry_type == WRITABLE && !HasFileSystemWritePermission()) { | 655 if (entry_type == WRITABLE && !HasFileSystemWritePermission()) { |
653 error_ = kRequiresFileSystemWriteError; | 656 error_ = kRequiresFileSystemWriteError; |
654 return false; | 657 return false; |
655 } | 658 } |
656 | 659 |
657 file_type_info.support_drive = true; | 660 file_type_info.support_drive = true; |
658 return ShowPicker(suggested_name, file_type_info, picker_type, entry_type); | 661 return ShowPicker(suggested_name, file_type_info, picker_type, entry_type); |
659 } | 662 } |
660 | 663 |
661 } // namespace extensions | 664 } // namespace extensions |
OLD | NEW |