diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 06:33:49 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 06:33:49 +0000 |
| commit | 6bedbeffa4fa25ba16d50253dcc7c1aec5ac4702 (patch) | |
| tree | 5fc0d89db7a803deb01216ba5684e69cfba0d613 /content | |
| parent | 324498de7f9df460267c1888a6cd565e77fb2421 (diff) | |
| download | chromium_src-6bedbeffa4fa25ba16d50253dcc7c1aec5ac4702.zip chromium_src-6bedbeffa4fa25ba16d50253dcc7c1aec5ac4702.tar.gz chromium_src-6bedbeffa4fa25ba16d50253dcc7c1aec5ac4702.tar.bz2 | |
Change dialog texts for folder upload to explicitly indicate it's for 'Uploading'
Currently we show the same dialog title and confirm button
('Select Folder' and 'OK' or 'Open') for folder upload,
but it should more clearly tell that it's for 'uploading',
so that the user can know s/he is exposing the folder
content to the website.
This patch makes following UI string changes to make it clear:
* "Select a folder to upload" for dialog title on ChromeOS
(original text is: "Select a folder to open")
* "Select Folder to Upload" for dialog title on other platforms
(original text is: "Select Folder")
* "Upload" for dialog confirm button (original text is: "Open")
The new string texts have gotten LGTM by UI team.
BUG=252888
TEST=manual
R=avi@chromium.org, jamesr@chromium.org, sky@chromium.org, yoshiki@chromium.org
Review URL: https://codereview.chromium.org/18627002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/public/common/file_chooser_params.h | 4 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/content/public/common/file_chooser_params.h b/content/public/common/file_chooser_params.h index 455ec42..0c7f1e4 100644 --- a/content/public/common/file_chooser_params.h +++ b/content/public/common/file_chooser_params.h @@ -25,8 +25,8 @@ struct CONTENT_EXPORT FileChooserParams { // Like Open, but allows picking multiple files to open. OpenMultiple, - // Like Open, but selects a folder. - OpenFolder, + // Like Open, but selects a folder for upload. + UploadFolder, // Allows picking a nonexistent file, and prompts to overwrite if the file // already exists. diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index b739d86..7f2efd8 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -2416,7 +2416,7 @@ bool RenderViewImpl::runFileChooser( return false; FileChooserParams ipc_params; if (params.directory) - ipc_params.mode = FileChooserParams::OpenFolder; + ipc_params.mode = FileChooserParams::UploadFolder; else if (params.multiSelect) ipc_params.mode = FileChooserParams::OpenMultiple; else if (params.saveAs) |