summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/status/input_method_menu.cc3
-rw-r--r--chrome/browser/chromeos/status/input_method_menu_unittest.cc4
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc
index e1411e8..779c767 100644
--- a/chrome/browser/chromeos/status/input_method_menu.cc
+++ b/chrome/browser/chromeos/status/input_method_menu.cc
@@ -84,9 +84,10 @@ const struct {
const char* indicator_text;
} kMappingFromIdToIndicatorText[] = {
// To distinguish from "xkb:us::eng"
+ { "xkb:us:altgr-intl:eng", "INTL" },
{ "xkb:us:dvorak:eng", "DV" },
// To distinguish from "xkb:jp::jpn"
- { "mozc", "\xe3\x81\x82" }, // Japanese Hiragana letter A in UTF-8.
+ { "mozc", "\xe3\x81\x82" }, // U+3042, Japanese Hiragana letter A in UTF-8.
{ "mozc-dv", "\xe3\x81\x82" },
{ "mozc-jp", "\xe3\x81\x82" },
// For simplified Chinese input methods
diff --git a/chrome/browser/chromeos/status/input_method_menu_unittest.cc b/chrome/browser/chromeos/status/input_method_menu_unittest.cc
index 3d194b7..8a2c4ba 100644
--- a/chrome/browser/chromeos/status/input_method_menu_unittest.cc
+++ b/chrome/browser/chromeos/status/input_method_menu_unittest.cc
@@ -35,6 +35,10 @@ TEST(InputMethodMenuTest, GetTextForIndicatorTest) {
EXPECT_EQ(L"DV", InputMethodMenu::GetTextForIndicator(desc));
}
{
+ InputMethodDescriptor desc("xkb:us:altgr-intl:eng", "US intl", "us", "eng");
+ EXPECT_EQ(L"INTL", InputMethodMenu::GetTextForIndicator(desc));
+ }
+ {
InputMethodDescriptor desc("mozc", "Mozc", "us", "ja");
EXPECT_EQ(UTF8ToWide("\xe3\x81\x82"),
InputMethodMenu::GetTextForIndicator(desc));