summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/generated_resources.grd4
-rw-r--r--chrome/browser/chromeos/input_method/input_method_util.cc2
-rw-r--r--chrome/browser/chromeos/status/input_method_menu.cc1
-rw-r--r--chrome/browser/chromeos/status/input_method_menu_unittest.cc6
4 files changed, 13 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 4a6e951..9620410 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11020,6 +11020,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
desc="The label for the Google Japanese Input input method for Japanese keyboard">
Google Japanese Input (for Japanese keyboard)
</message>
+ <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_HANDWRITING_INPUT_METHOD"
+ desc="The label for the Japanese handwriting input method">
+ Handwriting input method for Japanese
+ </message>
<message name="IDS_OPTIONS_SETTINGS_LANGUAGES_KOREAN_INPUT_METHOD"
desc="The label for the Korean input method">
Korean input method
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index fac3f84..e2d2ba14 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -185,6 +185,8 @@ const struct EnglishToResouceId {
IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_GOOGLE_US_DV_INPUT_METHOD },
{ "Google Japanese Input (Japanese keyboard layout)",
IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_GOOGLE_JP_INPUT_METHOD },
+ { "Japanese hand-writing engine",
+ IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_HANDWRITING_INPUT_METHOD },
{ "Korean", IDS_OPTIONS_SETTINGS_LANGUAGES_KOREAN_INPUT_METHOD },
// For ibus-xkb-layouts engine: third_party/ibus-xkb-layouts/files
diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc
index 9b1b0f9..a817509 100644
--- a/chrome/browser/chromeos/status/input_method_menu.cc
+++ b/chrome/browser/chromeos/status/input_method_menu.cc
@@ -93,6 +93,7 @@ const struct {
{ "mozc", "\xe3\x81\x82" }, // U+3042, Japanese Hiragana letter A in UTF-8.
{ "mozc-dv", "\xe3\x81\x82" },
{ "mozc-jp", "\xe3\x81\x82" },
+ { "ibus-zinnia-japanese", "\xe6\x89\x8b" }, // U+624B, "hand"
// For simplified Chinese input methods
{ "pinyin", "\xe6\x8b\xbc" }, // U+62FC
// For traditional 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 021751f..67931fe 100644
--- a/chrome/browser/chromeos/status/input_method_menu_unittest.cc
+++ b/chrome/browser/chromeos/status/input_method_menu_unittest.cc
@@ -69,6 +69,12 @@ TEST(InputMethodMenuTest, GetTextForIndicatorTest) {
InputMethodMenu::GetTextForIndicator(desc));
}
{
+ InputMethodDescriptor desc("ibus-zinnia-japanese", "Zinnia",
+ "us", "us", "ja");
+ EXPECT_EQ(UTF8ToWide("\xe6\x89\x8b"),
+ InputMethodMenu::GetTextForIndicator(desc));
+ }
+ {
InputMethodDescriptor desc("pinyin", "Pinyin", "us", "us", "zh-CN");
EXPECT_EQ(UTF8ToWide("\xe6\x8b\xbc"),
InputMethodMenu::GetTextForIndicator(desc));