diff options
| author | haraken@google.com <haraken@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-02 02:27:45 +0000 |
|---|---|---|
| committer | haraken@google.com <haraken@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-02 02:27:45 +0000 |
| commit | 492a095bacc85c7005fb30cd8665bf72f2083379 (patch) | |
| tree | 40e4b7f085d76bf084b66d95554c0684d488c7cd /webkit/glue | |
| parent | b061cb16f488b1f4368fdf9bafa7dcc683b61859 (diff) | |
| download | chromium_src-492a095bacc85c7005fb30cd8665bf72f2083379.zip chromium_src-492a095bacc85c7005fb30cd8665bf72f2083379.tar.gz chromium_src-492a095bacc85c7005fb30cd8665bf72f2083379.tar.bz2 | |
Add a WebLocalizedString::FileButtonChooseMultipleFilesLabel case to ToMessageID()
BUG=https://bugs.webkit.org/show_bug.cgi?id=49245
TEST=LayoutTests/fast/forms/input-file-label.html
Review URL: http://codereview.chromium.org/7292031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkit_strings.grd | 4 | ||||
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/webkit/glue/webkit_strings.grd b/webkit/glue/webkit_strings.grd index 07957e9..cf5d766 100644 --- a/webkit/glue/webkit_strings.grd +++ b/webkit/glue/webkit_strings.grd @@ -269,10 +269,10 @@ below: <message name="IDS_FORM_RESET_LABEL" desc="default label for Reset buttons in forms on web pages"> Reset </message> - <message name="IDS_FORM_FILE_BUTTON_LABEL" desc="title for file button used in HTML forms"> + <message name="IDS_FORM_FILE_BUTTON_LABEL" desc="title for a single file chooser button used in HTML forms"> Choose File </message> - <message name="IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL" desc="title for file button used in HTML5 file chooser"> + <message name="IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL" desc="title for a multiple file chooser button used in HTML forms. This title should be as short as possible."> Choose Files </message> <message name="IDS_FORM_FILE_NO_FILE_LABEL" desc="text to display in file button used in HTML forms when no file is selected"> diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 2abff7a..affbf7e 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -123,6 +123,8 @@ static int ToMessageID(WebLocalizedString::Name name) { return IDS_FORM_RESET_LABEL; case WebLocalizedString::FileButtonChooseFileLabel: return IDS_FORM_FILE_BUTTON_LABEL; + case WebLocalizedString::FileButtonChooseMultipleFilesLabel: + return IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL; case WebLocalizedString::FileButtonNoFileSelectedLabel: return IDS_FORM_FILE_NO_FILE_LABEL; case WebLocalizedString::MultipleFileUploadText: @@ -191,8 +193,10 @@ static int ToMessageID(WebLocalizedString::Name name) { return IDS_FORM_VALIDATION_RANGE_OVERFLOW; case WebLocalizedString::ValidationStepMismatch: return IDS_FORM_VALIDATION_STEP_MISMATCH; - // TODO(haraken): Remove default: when we merge the next - // WebLocalizedString.h change in WebKit. + // This "default:" line exists to avoid compile warnings about enum + // coverage when we add a new symbol to WebLocalizedString.h in WebKit. + // After a planned WebKit patch is landed, we need to add a case statement + // for the added symbol here. default: break; } |