| Index: ui/shell_dialogs/select_file_dialog_mac.mm
|
| diff --git a/ui/shell_dialogs/select_file_dialog_mac.mm b/ui/shell_dialogs/select_file_dialog_mac.mm
|
| index 218d39dc90970f0cc89de5e5038dfc5698a98a5a..132f9a69adc6e558629eeada53e7bb704196b75e 100644
|
| --- a/ui/shell_dialogs/select_file_dialog_mac.mm
|
| +++ b/ui/shell_dialogs/select_file_dialog_mac.mm
|
| @@ -178,6 +178,7 @@ void SelectFileDialogImpl::SelectFileImpl(
|
| gfx::NativeWindow owning_window,
|
| void* params) {
|
| DCHECK(type == SELECT_FOLDER ||
|
| + type == SELECT_UPLOAD_FOLDER ||
|
| type == SELECT_OPEN_FILE ||
|
| type == SELECT_OPEN_MULTI_FILE ||
|
| type == SELECT_SAVEAS_FILE);
|
| @@ -274,11 +275,13 @@ void SelectFileDialogImpl::SelectFileImpl(
|
| else
|
| [open_dialog setAllowsMultipleSelection:NO];
|
|
|
| - if (type == SELECT_FOLDER) {
|
| + if (type == SELECT_FOLDER || type == SELECT_UPLOAD_FOLDER) {
|
| [open_dialog setCanChooseFiles:NO];
|
| [open_dialog setCanChooseDirectories:YES];
|
| [open_dialog setCanCreateDirectories:YES];
|
| - NSString *prompt = l10n_util::GetNSString(IDS_SELECT_FOLDER_BUTTON_TITLE);
|
| + NSString *prompt = (type == SELECT_UPLOAD_FOLDER)
|
| + ? l10n_util::GetNSString(IDS_SELECT_UPLOAD_FOLDER_BUTTON_TITLE)
|
| + : l10n_util::GetNSString(IDS_SELECT_FOLDER_BUTTON_TITLE);
|
| [open_dialog setPrompt:prompt];
|
| } else {
|
| [open_dialog setCanChooseFiles:YES];
|
|
|