diff options
Diffstat (limited to 'chrome/browser')
15 files changed, 15 insertions, 15 deletions
diff --git a/chrome/browser/devtools/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc index 4aef091..d1f2888 100644 --- a/chrome/browser/devtools/devtools_file_helper.cc +++ b/chrome/browser/devtools/devtools_file_helper.cc @@ -77,7 +77,7 @@ class SelectFileDialog : public ui::SelectFileDialog::Listener, default_path, NULL, 0, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), NULL, NULL); } diff --git a/chrome/browser/download/download_file_picker.cc b/chrome/browser/download/download_file_picker.cc index b18a0f0..a968b06 100644 --- a/chrome/browser/download/download_file_picker.cc +++ b/chrome/browser/download/download_file_picker.cc @@ -91,7 +91,7 @@ void DownloadFilePicker::Init( suggested_path_, &file_type_info, 0, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), owning_window, NULL); } diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index af98260..754eeee 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -946,7 +946,7 @@ void BookmarksIOFunction::ShowSelectFileDialog( default_path, &file_type_info, 0, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), NULL, NULL); } diff --git a/chrome/browser/extensions/api/developer_private/entry_picker.cc b/chrome/browser/extensions/api/developer_private/entry_picker.cc index d305f4f..12a2994 100644 --- a/chrome/browser/extensions/api/developer_private/entry_picker.cc +++ b/chrome/browser/extensions/api/developer_private/entry_picker.cc @@ -64,7 +64,7 @@ EntryPicker::EntryPicker(EntryPickerClient* client, last_directory, &info, file_type_index, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), owning_window, NULL); } 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 3b4e6f7..e849e3cc 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -437,7 +437,7 @@ class FileSystemChooseEntryFunction::FilePicker suggested_name, &file_type_info, 0, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), owning_window, NULL); } diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index f5f4d68..09b7f8e 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -126,7 +126,7 @@ void GetDownloadFilePath( directory.AppendASCII(id + "_" + random_number + ".crx"); int uniquifier = - file_util::GetUniquePathNumber(file, FILE_PATH_LITERAL(std::string())); + file_util::GetUniquePathNumber(file, base::FilePath::StringType()); if (uniquifier > 0) { file = file.InsertBeforeExtensionASCII( base::StringPrintf(" (%d)", uniquifier)); diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index 3d07ff2..48cf490 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -426,7 +426,7 @@ void FileSelectHelper::RunFileChooserOnUIThread( select_file_types_.get() && !select_file_types_->extensions.empty() ? 1 : 0, // 1-based index of default extension to show. - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), owning_window, #if defined(OS_ANDROID) &accept_types); diff --git a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc index d4fbba4..1356cf6 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser_unittest.cc @@ -324,7 +324,7 @@ TEST(GDataWAPIParserTest, ResourceEntryHasDocumentExtension) { EXPECT_FALSE(ResourceEntry::HasHostedDocumentExtension( base::FilePath(FILE_PATH_LITERAL("Test")))); EXPECT_FALSE(ResourceEntry::HasHostedDocumentExtension( - base::FilePath(FILE_PATH_LITERAL(std::string())))); + base::FilePath())); } TEST(GDataWAPIParserTest, ResourceEntryClassifyEntryKind) { diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc index 27b8765..bcd3ae3 100644 --- a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc +++ b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc @@ -186,7 +186,7 @@ void MediaGalleriesDialogController::OnAddFolderClicked() { user_data_dir, NULL, 0, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), web_contents_->GetView()->GetTopLevelNativeWindow(), NULL); } diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index c6b30b8..a31b4b0 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -817,7 +817,7 @@ void Browser::OpenFile() { directory, &file_types, 0, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), parent_window, NULL); } diff --git a/chrome/browser/ui/chrome_select_file_policy_unittest.cc b/chrome/browser/ui/chrome_select_file_policy_unittest.cc index 0d20463..ad735f8 100644 --- a/chrome/browser/ui/chrome_select_file_policy_unittest.cc +++ b/chrome/browser/ui/chrome_select_file_policy_unittest.cc @@ -56,7 +56,7 @@ class FileSelectionUser : public ui::SelectFileDialog::Listener { file_path, NULL, 0, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType()), NULL, NULL); file_selection_initialisation_in_progress = false; diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index 914939e..11ea684 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -935,7 +935,7 @@ void ExtensionSettingsHandler::HandleLoadUnpackedExtensionMessage( last_unpacked_directory_, NULL, kFileTypeIndex, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(), NULL); } diff --git a/chrome/browser/ui/webui/extensions/pack_extension_handler.cc b/chrome/browser/ui/webui/extensions/pack_extension_handler.cc index 0623fda..d201c91 100644 --- a/chrome/browser/ui/webui/extensions/pack_extension_handler.cc +++ b/chrome/browser/ui/webui/extensions/pack_extension_handler.cc @@ -189,7 +189,7 @@ void PackExtensionHandler::HandleSelectFilePathMessage( base::FilePath(), &info, file_type_index, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(), NULL); } diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 081806f..54c5c31 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -1196,7 +1196,7 @@ void BrowserOptionsHandler::HandleSelectDownloadLocation( pref_service->GetFilePath(prefs::kDownloadDefaultDirectory), &info, 0, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(), NULL); } diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index ec05b59..7899260 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -866,7 +866,7 @@ void PrintPreviewHandler::SelectFile(const base::FilePath& default_filename) { sticky_settings->save_path()->Append(default_filename), &file_type_info, 0, - FILE_PATH_LITERAL(std::string()), + base::FilePath::StringType(), platform_util::GetTopLevel( preview_web_contents()->GetView()->GetNativeView()), NULL); |