diff options
Diffstat (limited to 'chrome/browser/extensions/api/file_system/file_system_api.cc')
-rw-r--r-- | chrome/browser/extensions/api/file_system/file_system_api.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index 7dac9bb..67d717b 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -153,7 +153,7 @@ bool g_allow_directory_access_for_test = false; bool GetFileTypesFromAcceptOption( const file_system::AcceptOption& accept_option, std::vector<base::FilePath::StringType>* extensions, - string16* description) { + base::string16* description) { std::set<base::FilePath::StringType> extension_set; int description_id = 0; @@ -469,7 +469,7 @@ class FileSystemChooseEntryFunction::FilePicker } select_file_dialog_->SelectFile(picker_type, - string16(), + base::string16(), suggested_name, &file_type_info, 0, @@ -774,7 +774,7 @@ void FileSystemChooseEntryFunction::BuildFileTypeInfo( typedef file_system::AcceptOption AcceptOption; for (std::vector<linked_ptr<AcceptOption> >::const_iterator iter = accepts->begin(); iter != accepts->end(); ++iter) { - string16 description; + base::string16 description; std::vector<base::FilePath::StringType> extensions; if (!GetFileTypesFromAcceptOption(**iter, &extensions, &description)) |