Remove redundant "keyboard layout" suffix and fix redundant language display.

Remove redundant "keyboard layout" suffix and fix redundant language display.

This issue is two-fold:

1) Remove "keyboard layout"-suffix from layouts
2) Do not show language name if obvious

For 1, basically I removed the suffix from keyboard layout names.
There are 2 exceptions:
 * For Japanese, to avoid confusion between Jpaanese input methods and
   Japanese keyboard layout, the suffix is intentionally kept.
 * For keyboard layouts used for Dutch, French and German,
   the suffix is kept (see below for the reason).

For 2,
* for non-ambiguous languages (do not have multiple input methods or layouts),
  show input method name or layout name
* for ambiguous languages
  - show keyboard layout or input method name without language name for
    other languages (as their layout name or input method name explicitly
    or implicitly imply language name)
  - show "language - layout" pair for Dutch, French and German
    (They share "Belgian" keyboard layout in common, showing only "Belgian"
    is ambiguous about language)

BUG=chromium-os:5804
TEST=./unit_tests --gtest_filter="LanguageMenu*" and manually check on ChromeOS device whether the menu text and notification menu are displayed as expected.

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

[kochi, 2010-08-23 13:52:14]

Hi Yusuke, could you review this?

[Yusuke Sato, 2010-08-23 19:46:43]

http://codereview.chromium.org/3185020/diff/1/3
File chrome/browser/chromeos/status/language_menu_button.cc (right):

http://codereview.chromium.org/3185020/diff/1/3#newcode330
chrome/browser/chromeos/status/language_menu_button.cc:330: need_method_name);
I guess you have to replace |need_method_name| with true as well. Otherwise, for
example, when only "US qwerty" is active, "English (United States)" is used in
the menu??  It is not what alcor suggested in crosbug.com/5804. He suggested
that we should use an input method name, not a language name.

If my guess is correct, you can remove the second parameter of GetTextForMenu(),
since it's always true, and you can also remove GetLanguageName().

[kochi, 2010-08-24 09:06:32]

Thanks for the review, Yusuke-san.

During my test, I found that other exceptional case for
Arabic/Hebrew/Hindi.  Their input method names are
"Standard Input Method" and cannot be identifiable in
language menu, so I made them appear as "Arabic - Standard
Input Method".

http://codereview.chromium.org/3185020/diff/1/3
File chrome/browser/chromeos/status/language_menu_button.cc (right):

http://codereview.chromium.org/3185020/diff/1/3#newcode330
chrome/browser/chromeos/status/language_menu_button.cc:330: need_method_name);
First I thought that as we merged keyboard layout and input method in one place,
it would be nice when a user want to
input "a language", regardless of keyboard layout or input
method, he just has to select the "language", not a layout
name or an input method name.

But I also think that the appearance of menu list will
become inconsistent, if we mix language names and input
method names.

So I agree that we should go use only input method name
for menu text.

[Yusuke Sato, 2010-08-24 17:40:59]

LGTM. Thanks for the work!

http://codereview.chromium.org/3185020/diff/16001/17002
File chrome/browser/chromeos/status/language_menu_button.cc (right):

http://codereview.chromium.org/3185020/diff/16001/17002#newcode639
chrome/browser/chromeos/status/language_menu_button.cc:639: if
(input_method.language_code == "ar" ||
I think it would be better not to use a raw language_code. See my comment below.

http://codereview.chromium.org/3185020/diff/16001/17002#newcode645
chrome/browser/chromeos/status/language_menu_button.cc:645: const std::string
language_code
Please move this to L.637 and use |language_code| in the conditions above.

[kochi, 2010-08-25 07:12:40]

Thanks for the review!

http://codereview.chromium.org/3185020/diff/16001/17002
File chrome/browser/chromeos/status/language_menu_button.cc (right):

http://codereview.chromium.org/3185020/diff/16001/17002#newcode639
chrome/browser/chromeos/status/language_menu_button.cc:639: if
(input_method.language_code == "ar" ||
On 2010/08/24 17:40:59, Yusuke Sato wrote:
> I think it would be better not to use a raw language_code. See my comment
below.
> 

Done.

http://codereview.chromium.org/3185020/diff/16001/17002#newcode645
chrome/browser/chromeos/status/language_menu_button.cc:645: const std::string
language_code
On 2010/08/24 17:40:59, Yusuke Sato wrote:
> Please move this to L.637 and use |language_code| in the conditions above.
> 

Done.