GitLab

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.

Review URL: http://codereview.chromium.org/3185020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57304 0039d316-1c4b-4281-b951-d872f2087c98