diff options
| author | haraken@google.com <haraken@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 23:46:18 +0000 |
|---|---|---|
| committer | haraken@google.com <haraken@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 23:46:18 +0000 |
| commit | 9a08908fbe72c1e6cc0f9127cde5d758272ab197 (patch) | |
| tree | 8d8653ea1af4511b79ceca9fcf083774490bdec5 /webkit | |
| parent | 756a7e55c4870d5899fcb804416b6dbb6f2e3173 (diff) | |
| download | chromium_src-9a08908fbe72c1e6cc0f9127cde5d758272ab197.zip chromium_src-9a08908fbe72c1e6cc0f9127cde5d758272ab197.tar.gz chromium_src-9a08908fbe72c1e6cc0f9127cde5d758272ab197.tar.bz2 | |
Change a label of the HTML5 multiple file chooser to "Choose One or More Files".
Add "default:" to the WebLocalizedString switch statement in ToMessageID(). This is needed to avoid compiler warnings about enum coverage when we add new symbols to WebLocalizedString.h. This "default:" is going to be removed when a planned WebLocalizedString.h change is merged.
BUG=https://bugs.webkit.org/show_bug.cgi?id=49245
TEST=No change in behavior
Review URL: http://codereview.chromium.org/7273024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_strings.grd | 3 | ||||
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/webkit_strings.grd b/webkit/glue/webkit_strings.grd index 15e9b08..07957e9 100644 --- a/webkit/glue/webkit_strings.grd +++ b/webkit/glue/webkit_strings.grd @@ -272,6 +272,9 @@ below: <message name="IDS_FORM_FILE_BUTTON_LABEL" desc="title for file 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"> + 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"> No file chosen </message> diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 34c3579..2abff7a 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -191,6 +191,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. + default: + break; } return -1; } |