Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2265)

Unified Diff: ui/shell_dialogs/select_file_dialog_mac.mm

Issue 18627002: Change dialog texts for folder upload to explicitly indicate it's for 'Uploading' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 15113184ca7b425b878a3c0c726690fc92b11ac3..f3affe834b183f836e19c5f7b225cc6342b62e21 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];

Powered by Google App Engine
This is Rietveld 408576698