Support German Neo 2 xkb layout.

BUG=chromium-os:10918
TEST=manually on the netbook

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

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

6 files changed, 13 insertions, 0 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 62151c4..4f7e3c0 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11043,6 +11043,9 @@ This web page was killed, either because Chrome ran out of memory, or you chose
       <message name="IDS_STATUSBAR_LAYOUT_GERMANY" desc="In the language menu button, this shows the input mode.">
         German keyboard layout
       </message>
+      <message name="IDS_STATUSBAR_LAYOUT_GERMANY_NEO2" desc="In the language menu button, this shows the input mode.">
+        German (Neo 2)
+      </message>
       <message name="IDS_STATUSBAR_LAYOUT_ITALY" desc="In the language menu button, this shows the input mode.">
         Italian
       </message>
diff --git a/chrome/browser/chromeos/cros/input_method_library.cc b/chrome/browser/chromeos/cros/input_method_library.cc
index 1690901..e4574e5 100644
--- a/chrome/browser/chromeos/cros/input_method_library.cc
+++ b/chrome/browser/chromeos/cros/input_method_library.cc
@@ -928,6 +928,8 @@ class InputMethodLibraryStubImpl : public InputMethodLibrary {
     descriptions->push_back(InputMethodDescriptor(
         "xkb:de::ger", "Germany", "de", "ger"));
     descriptions->push_back(InputMethodDescriptor(
+        "xkb:de:neo:ger", "Germany - Neo 2", "de(neo)", "ger"));
+    descriptions->push_back(InputMethodDescriptor(
         "xkb:gr::gre", "Greece", "gr", "gre"));
     descriptions->push_back(InputMethodDescriptor(
         "xkb:hu::hun", "Hungary", "hu", "hun"));
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index ed64023..1b857e2 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -178,6 +178,7 @@ const struct EnglishToResouceId {
   { "Japan", IDS_STATUSBAR_LAYOUT_JAPAN },
   { "Slovenia", IDS_STATUSBAR_LAYOUT_SLOVENIA },
   { "Germany", IDS_STATUSBAR_LAYOUT_GERMANY },
+  { "Germany - Neo 2", IDS_STATUSBAR_LAYOUT_GERMANY_NEO2 },
   { "Italy", IDS_STATUSBAR_LAYOUT_ITALY },
   { "Estonia", IDS_STATUSBAR_LAYOUT_ESTONIA },
   { "Hungary", IDS_STATUSBAR_LAYOUT_HUNGARY },
diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
index 0a4d7be..3890438 100644
--- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
@@ -106,6 +106,7 @@ TEST_F(InputMethodUtilTest, GetKeyboardLayoutName) {
   EXPECT_EQ("us", GetKeyboardLayoutName("xkb:us::eng"));
   EXPECT_EQ("us(dvorak)", GetKeyboardLayoutName("xkb:us:dvorak:eng"));
   EXPECT_EQ("us(colemak)", GetKeyboardLayoutName("xkb:us:colemak:eng"));
+  EXPECT_EQ("de(neo)", GetKeyboardLayoutName("xkb:de:neo:ger"));
 }
 
 TEST_F(InputMethodUtilTest, GetLanguageCodeFromInputMethodId) {
diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc
index a936ebd..1cb2e9d 100644
--- a/chrome/browser/chromeos/status/input_method_menu.cc
+++ b/chrome/browser/chromeos/status/input_method_menu.cc
@@ -87,6 +87,7 @@ const struct {
   { "xkb:us:dvorak:eng", "DV" },
   { "xkb:us:intl:eng", "INTL" },
   { "xkb:us:colemak:eng", "CO" },
+  { "xkb:de:neo:ger", "NEO" },
   // To distinguish from "xkb:jp::jpn"
   { "mozc", "\xe3\x81\x82" },  // U+3042, Japanese Hiragana letter A in UTF-8.
   { "mozc-dv", "\xe3\x81\x82" },
diff --git a/chrome/browser/chromeos/status/input_method_menu_unittest.cc b/chrome/browser/chromeos/status/input_method_menu_unittest.cc
index a1c2be4..38704f4 100644
--- a/chrome/browser/chromeos/status/input_method_menu_unittest.cc
+++ b/chrome/browser/chromeos/status/input_method_menu_unittest.cc
@@ -49,6 +49,11 @@ TEST(InputMethodMenuTest, GetTextForIndicatorTest) {
     EXPECT_EQ(L"INTL", InputMethodMenu::GetTextForIndicator(desc));
   }
   {
+    InputMethodDescriptor desc("xkb:de:neo:ger", "Germany - Neo 2", "de(neo)",
+                               "ger");
+    EXPECT_EQ(L"NEO", InputMethodMenu::GetTextForIndicator(desc));
+  }
+  {
     InputMethodDescriptor desc("mozc", "Mozc", "us", "ja");
     EXPECT_EQ(UTF8ToWide("\xe3\x81\x82"),
               InputMethodMenu::GetTextForIndicator(desc));