Index: chrome/browser/chromeos/input_method/input_method_util.cc |
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc |
index 7b96a2e4d1e00c92ed5eb63ca96eb7e7c9bdb1a6..17b0a61b9ead29a19e586736e7a404353b0eb864 100644 |
--- a/chrome/browser/chromeos/input_method/input_method_util.cc |
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc |
@@ -28,81 +28,6 @@ |
namespace { |
-// Mapping from input method ID to keyboard overlay ID, which specifies the |
-// layout and the glyphs of the keyboard overlay. |
-// TODO(mazda): Move this list to whitelist.txt (http://crosbug.com/9682) |
-const struct InputMethodIdToKeyboardOverlayId { |
- const char* input_method_id; |
- const char* keyboard_overlay_id; |
-} kInputMethodIdToKeyboardOverlayId[] = { |
- { "xkb:nl::nld", "nl" }, |
- { "xkb:be::nld", "nl" }, |
- { "xkb:fr::fra", "fr" }, |
- { "xkb:be::fra", "fr" }, |
- { "xkb:ca::fra", "fr_CA" }, |
- { "xkb:ch:fr:fra", "fr" }, |
- { "xkb:de::ger", "de" }, |
- { "xkb:be::ger", "de" }, |
- { "xkb:ch::ger", "de" }, |
- { "mozc", "en_US" }, |
- { "mozc-jp", "ja" }, |
- { "mozc-dv", "en_US_dvorak" }, |
- { "xkb:jp::jpn", "ja" }, |
- { "xkb:ru::rus", "ru" }, |
- { "xkb:ru:phonetic:rus", "ru" }, |
- { "m17n:th:kesmanee", "th" }, |
- { "m17n:th:pattachote", "th" }, |
- { "m17n:th:tis820", "th" }, |
- { "chewing", "zh_TW" }, |
- { "m17n:zh:cangjie", "zh_TW" }, |
- { "m17n:zh:quick", "zh_TW" }, |
- { "m17n:vi:tcvn", "vi" }, |
- { "m17n:vi:telex", "vi" }, |
- { "m17n:vi:viqr", "vi" }, |
- { "m17n:vi:vni", "vi" }, |
- { "xkb:us::eng", "en_US" }, |
- { "xkb:us:intl:eng", "en_US" }, |
- { "xkb:us:altgr-intl:eng", "en_US" }, |
- { "xkb:us:dvorak:eng", "en_US_dvorak" }, |
- // TODO(mazda): Add keyboard overlay definition for US Colemak. |
- { "xkb:us:colemak:eng", "en_US" }, |
- { "hangul", "ko" }, |
- { "pinyin", "zh_CN" }, |
- { "m17n:ar:kbd", "ar" }, |
- { "m17n:hi:itrans", "hi" }, |
- { "m17n:fa:isiri", "ar" }, |
- { "xkb:br::por", "pt_BR" }, |
- { "xkb:bg::bul", "bg" }, |
- { "xkb:bg:phonetic:bul", "bg" }, |
- { "xkb:ca:eng:eng", "ca" }, |
- { "xkb:cz::cze", "cs" }, |
- { "xkb:ee::est", "et" }, |
- { "xkb:es::spa", "es" }, |
- { "xkb:es:cat:cat", "ca" }, |
- { "xkb:dk::dan", "da" }, |
- { "xkb:gr::gre", "el" }, |
- { "xkb:il::heb", "iw" }, |
- { "xkb:kr:kr104:kor", "ko" }, |
- { "xkb:latam::spa", "es_419" }, |
- { "xkb:lt::lit", "lt" }, |
- { "xkb:lv:apostrophe:lav", "lv" }, |
- { "xkb:hr::scr", "hr" }, |
- { "xkb:gb:extd:eng", "en_GB" }, |
- { "xkb:fi::fin", "fi" }, |
- { "xkb:hu::hun", "hu" }, |
- { "xkb:it::ita", "it" }, |
- { "xkb:no::nob", "no" }, |
- { "xkb:pl::pol", "pl" }, |
- { "xkb:pt::por", "pt_PT" }, |
- { "xkb:ro::rum", "ro" }, |
- { "xkb:se::swe", "sv" }, |
- { "xkb:sk::slo", "sk" }, |
- { "xkb:si::slv", "sl" }, |
- { "xkb:rs::srp", "sr" }, |
- { "xkb:tr::tur", "tr" }, |
- { "xkb:ua::ukr", "uk" }, |
-}; |
- |
// Map from language code to associated input method IDs, etc. |
typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap; |
struct IdMaps { |