Adds support for Macedonian keyboard.

BUG=352459 TEST=Verified on linux_chromeos. Review URL: https://codereview.chromium.org/1237363002 Cr-Commit-Position: refs/heads/master@{#339334}
Denger-Network · Jul 17, 2015 · 3fc5b7b · 3fc5b7b
1 parent c6a4c3d
commit 3fc5b7b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
@@ -4925,6 +4925,9 @@ Battery full
   <message name="IDS_STATUSBAR_LAYOUT_IRISH" desc="In the language menu button, this shows the input mode [Irish keyboard].">
     Irish
   </message>
+  <message name="IDS_STATUSBAR_LAYOUT_MACEDONIAN" desc="In the language menu button, this shows the input mode [Macedonian keyboard].">
+    Macedonian
+  </message>
 
   <message name="IDS_IME_NAME_KEYBOARD_ARMENIAN_PHONETIC" desc="The input method name shows in system tray menu, this shows [Armenian Phonetic keyboard].">
     Armenian Phonetic keyboard
@@ -5016,6 +5019,9 @@ Battery full
   <message name="IDS_IME_NAME_KEYBOARD_LITHUANIAN" desc="The input method name shows in system tray menu, this shows [Lithuanian keyboard].">
     Lithuanian keyboard
   </message>
+  <message name="IDS_IME_NAME_KEYBOARD_MACEDONIAN" desc="The input method name shows in system tray menu, this shows [Macedonian keyboard].">
+    Macedonian keyboard
+  </message>
   <message name="IDS_IME_NAME_KEYBOARD_MALTESE" desc="The input method name shows in system tray menu, this shows [Maltese keyboard].">
     Maltese keyboard
   </message>

diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -158,6 +158,7 @@ const struct EnglishToResouceId {
   { "xkb:latam::spa", IDS_STATUSBAR_LAYOUT_LATIN_AMERICAN },
   { "xkb:lt::lit", IDS_STATUSBAR_LAYOUT_LITHUANIA },
   { "xkb:lv:apostrophe:lav", IDS_STATUSBAR_LAYOUT_LATVIA },
+  { "xkb:mk::mkd", IDS_STATUSBAR_LAYOUT_MACEDONIAN },
   { "xkb:mn::mon", IDS_STATUSBAR_LAYOUT_MONGOLIAN },
   { "xkb:nl::nld", IDS_STATUSBAR_LAYOUT_NETHERLANDS },
   { "xkb:no::nob", IDS_STATUSBAR_LAYOUT_NORWAY },
@@ -263,6 +264,7 @@ const struct InputMethodNameMap {
     {"__MSG_KEYBOARD_LATIN_AMERICAN__", IDS_IME_NAME_KEYBOARD_LATIN_AMERICAN},
     {"__MSG_KEYBOARD_LATVIAN__", IDS_IME_NAME_KEYBOARD_LATVIAN},
     {"__MSG_KEYBOARD_LITHUANIAN__", IDS_IME_NAME_KEYBOARD_LITHUANIAN},
+    {"__MSG_KEYBOARD_MACEDONIAN__", IDS_IME_NAME_KEYBOARD_MACEDONIAN},
     {"__MSG_KEYBOARD_MALAYALAM_PHONETIC__",
      IDS_IME_NAME_KEYBOARD_MALAYALAM_PHONETIC},
     {"__MSG_KEYBOARD_MALTESE__", IDS_IME_NAME_KEYBOARD_MALTESE},

diff --git a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json b/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json
@@ -956,6 +956,20 @@
       ],
       "input_view": "inputview.html#id=mt&language=mt&passwordLayout=mt&name=keyboard_maltese",
       "options_page": "hmm_options.html?code=xkb:mt::mlt"
+    },
+    {
+      "name": "__MSG_keyboard_macedonian__",
+      "type": "ime",
+      "id": "xkb:mk::mkd",
+      "description": "",
+      "language": [
+        "mk"
+      ],
+      "layouts": [
+        "mk"
+      ],
+      "input_view": "inputview.html#id=mk&language=mk&passwordLayout=us-ltr&name=keyboard_macedonian",
+      "options_page": "hmm_options.html?code=xkb:mk::mkd"
     }
   ],
   "manifest_version": 2

diff --git a/chromeos/ime/input_methods.txt b/chromeos/ime/input_methods.txt
@@ -123,6 +123,7 @@ xkb:ge::geo           ge             ka        GE
 xkb:mn::mon           mn             mn        MN
 xkb:ie::ga            ie             ga        GA login
 xkb:mt::mlt           mt             mt        MT login
+xkb:mk::mkd           mk             mk        MK
 
 # TODO(yusukes): Support xkb:latam:deadtilde:spa and/or xkb:latam:nodeadkeys:spa
 # if necessary.
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
@@ -59588,6 +59588,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="469000663" label="xkb:es:cat:cat">Catalan keyboard</int>
   <int value="520692028" label="vkd_ta_itrans">Tamil keyboard (itrans)</int>
   <int value="601883646" label="vkd_th_tis">Thai keyboard (TIS 820-2531)</int>
+  <int value="602570138" label="xkb:mk::mkd">Macedonian keyboard</int>
   <int value="629336408" label="vkd_ckb_ar">
     Sorani Kurdish Arabic-based keyboard
   </int>