Index: chromeos/ime/input_methods.txt |
diff --git a/chromeos/ime/input_methods.txt b/chromeos/ime/input_methods.txt |
index 2b4bc9101425630af854a5e8466c800316326908..d1e33cf74bb373684251872128ae8e81ca7bb48f 100644 |
--- a/chromeos/ime/input_methods.txt |
+++ b/chromeos/ime/input_methods.txt |
@@ -1,27 +1,5 @@ |
-# The list of input methods that we support. The input methods metadata is |
-# also defined here. We use this data for the following purposes. |
-# |
-# 1. Exclude unnecessary input methods. For example, we don't need |
-# "ja:anthy", and "zh:pinyin" engines in ibus-m17n since we have better |
-# alternatives outside of ibus-m17n. Excluding these input methods from |
-# the IBus engine XML files, such as /usr/share/ibus/component/m17n.xml, |
-# makes the startup time of the IBus daemon faster. This filtering is |
-# done using a python script at build time of ibus-m17n. |
-# See crosbug.com/4161 for details. |
-# |
-# 2. Provide the input methods metadata to Chrome at build time. Chrome |
-# needs to know about the supported input methods for the input method |
-# features, such as the input method switching and the options page, |
-# to work. Note that we can retrieve the same metadata from the IBus |
-# daemon, but Chrome needs be able to get the metadata without talking |
-# to the IBus daemon. This requirement comes from the fact that the |
-# IBus daemon should not run if the user is just using keyboard layouts |
-# such as US keyboard. The metadata generation is done using a python |
-# script at build time of Chrome. See crosbug.com/16961 for details. |
-# |
-# The order of the list is important. In Chrome's "Languages and input" options |
-# page, we list input methods in this order, when more than one input methods |
-# are available for a language (ex. French). |
+# The list of keyboard layouts that we support. The keyboard layout metadata is |
+# also defined here. |
# |
# Each non-comment line contains the following tab-separated columns. |
# |
@@ -37,8 +15,7 @@ |
# three-letter ones (ISO 639-2/T and 639-2/B) here. For "en", "pt", and "zh", |
# two-letter upper-case country code should be added (ex. "en-US", "zh-TW"). |
# See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes for details. |
-# 4) [optional] The #if condition for the input method. |
-# (ex. "defined(A)", "!defined(A)||defined(B)") |
+# We can specify multiple language code with comma separator. |
# |
# Notes: |
# When adding a line to this list, please also add a mapping from the input |
@@ -67,8 +44,8 @@ |
# that information in kHasLatinKeyboardLanguageList[] is still correct. |
# U.S. English |
-xkb:us::eng us en-US |
-xkb:us:intl:eng us(intl) en-US |
+xkb:us::eng us en-US,en-AU,id,fil,ms |
+xkb:us:intl:eng us(intl) en-US,nl,pt-BR |
xkb:us:altgr-intl:eng us(altgr-intl) en-US |
xkb:us:dvorak:eng us(dvorak) en-US |
xkb:us:colemak:eng us(colemak) en-US |
@@ -114,7 +91,7 @@ xkb:es:cat:cat es(cat) ca |
xkb:dk::dan dk da |
xkb:gr::gre gr el |
xkb:il::heb il he |
-xkb:latam::spa latam es |
+xkb:latam::spa latam es,es-419 |
xkb:lt::lit lt lt |
xkb:lv:apostrophe:lav lv(apostrophe) lv |
xkb:hr::scr hr hr |