chrome/browser/file_select_helper.cc - Issue 18627002: Change dialog texts for folder upload to explicitly indicate it's for 'Uploading'

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/file_select_helper.cc

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

« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc ('k') | chrome/browser/resources/file_manager/css/file_manager.css » ('j') | ui/shell_dialogs/select_file_dialog.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/file_select_helper.cc

diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc

index 6c44527a61e2c2519f888a5d77c6f8c3bbe30556..c8cb4fb4fc312f7d9cb2d38319e51f55554de2a9 100644

--- a/chrome/browser/file_select_helper.cc

+++ b/chrome/browser/file_select_helper.cc

@@ -141,7 +141,7 @@ void FileSelectHelper::FileSelectedWithExtraInfo(

profile_->set_last_selected_directory(file.file_path.DirName());

const base::FilePath& path = file.local_path;

- if (dialog_type_ == ui::SelectFileDialog::SELECT_FOLDER) {

+ if (dialog_type_ == ui::SelectFileDialog::SELECT_UPLOAD_FOLDER) {

StartNewEnumeration(path, kFileSelectEnumerationId, render_view_host_);

return;

}

@@ -394,8 +394,8 @@ void FileSelectHelper::RunFileChooserOnUIThread(

case FileChooserParams::OpenMultiple:

dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_MULTI_FILE;

break;

- case FileChooserParams::OpenFolder:

- dialog_type_ = ui::SelectFileDialog::SELECT_FOLDER;

+ case FileChooserParams::UploadFolder:

+ dialog_type_ = ui::SelectFileDialog::SELECT_UPLOAD_FOLDER;

break;

case FileChooserParams::Save:

dialog_type_ = ui::SelectFileDialog::SELECT_SAVEAS_FILE;