Change a label of the HTML5 multiple file chooser to "Choose One or More Files"

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


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=91051

[haraken1, 2011-06-28 07:17:14]

I am trying to fix WebKit bug 49245
(https://bugs.webkit.org/show_bug.cgi?id=49245). Since the WebKit patch depends
on this Chromium patch, I would like to commit this patch first. 

Would you please take a look at it?

[haraken1, 2011-06-28 14:37:20]

I found that things are a bit complicated...

This Chromium patch is depending on the corresponding WebKit patch
(https://bugs.webkit.org/show_bug.cgi?id=49245) and the WebKit patch is also
depending on this Chromium patch. Specifically,
WebLocalizedString::FileButtonChooseMultipleFilesLabel must exist in the
Chromium patch if and only if
WebLocalizedString::FileButtonChooseMultipleFilesLabel is defined in the WebKit
patch. In other words, 

[1] If FileButtonChooseMultipleFilesLabel exists in the Chromium patch
(webkit/glue/webkitclient_impl.cc) but is not defined in the WebKit patch
(Source/WebKit/chromium/public/WebLocalizedString.h), then obviously, the
Chromium build fails.
[2] If FileButtonChooseMultipleFilesLabel is defined in the WebKit patch but
does not exist in the Chromium patch, then the Chromium build fails because one
of the enum values (=FileButtonChooseMultipleFilesLabel) is not described in the
switch cases in webkitclient_impl.cc.

To address this issue, my idea is as follows:

Step1. In this patch, I describe FileButtonChooseMultipleFilesLabel in the
Chromium patch with a tricky macro "#if defined(WE_WILL_REMOVE_THIS_MACRO_SOON)"
in webkit/glue/webkitclient_impl.cc. 
Step2. I define FileButtonChooseMultipleFilesLabel in the WebKit patch and
define "#define WE_WILL_REMOVE_THIS_MACRO_SOON".
(https://bugs.webkit.org/show_bug.cgi?id=49245)
Step3. After I confirm that the Chromium patch of Step1 is landed, I remove
"#define WE_WILL_REMOVE_THIS_MACRO_SOON" from the WebKit patch.
Step4. After I confirm that the WebKit patch of Step2 is landed, I remove "#if
defined(WE_WILL_REMOVE_THIS_MACRO_SOON)" from the Chromium patch.

I think that these steps will guarantee that "FileButtonChooseMultipleFilesLabel
exists in the Chromium patch if and only if FileButtonChooseMultipleFilesLabel
is defined in the WebKit patch" at any time.

Do you have any better strategy to resolve this dependency problem?

[tkent, 2011-06-28 15:17:30]

You don't need such tricky macro.

See the following changes:
 1. http://src.chromium.org/viewvc/chrome?view=rev&revision=65502
 2. https://trac.webkit.org/changeset/72363
 3. http://src.chromium.org/viewvc/chrome?view=rev&revision=67382

[haraken1, 2011-06-29 01:18:32]

Thank you. I would follow your idea.


On 2011/06/28 15:17:30, Kent Tamura wrote:
> You don't need such tricky macro.
> 
> See the following changes:
>  1. http://src.chromium.org/viewvc/chrome?view=rev&revision=65502
>  2. https://trac.webkit.org/changeset/72363
>  3. http://src.chromium.org/viewvc/chrome?view=rev&revision=67382

[tony, 2011-06-29 22:27:42]

LGTM

[commit-bot: I haz the power, 2011-06-29 23:46:19]

Change committed as 91051

[tkent, 2011-06-30 00:31:52]

http://codereview.chromium.org/7273024/diff/6004/webkit/glue/webkit_strings.grd
File webkit/glue/webkit_strings.grd (right):

http://codereview.chromium.org/7273024/diff/6004/webkit/glue/webkit_strings.g...
webkit/glue/webkit_strings.grd:270: <message
name="IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL" desc="title for file button used in
HTML5 file chooser">
The description looks insufficient.
We should mention:
 - This message is for "multiple"
 - We should make translations shorter as possible.

[haraken1, 2011-06-30 00:42:04]

Kent: Sorry for committing this patch...
I would like to fix the description when I remove the "default:" line in the
next patch.