Add Romanian standard keyboard.

BUG=243440 TEST=Verified on clapper. Review URL: https://codereview.chromium.org/853143002 Cr-Commit-Position: refs/heads/master@{#312329}
Denger-Network · Jan 21, 2015 · 678686d · 678686d
1 parent 22a80e7
commit 678686d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
@@ -4805,6 +4805,9 @@ Battery full
   <message name="IDS_IME_NAME_KEYBOARD_ROMANIAN" desc="The input method name shows in system tray menu, this shows [Romanian keyboard].">
     Romanian keyboard
   </message>
+  <message name="IDS_IME_NAME_KEYBOARD_ROMANIAN_STANDARD" desc="The input method name shows in system tray menu, this shows [Romanian standard keyboard].">
+    Romanian standard keyboard
+  </message>
   <message name="IDS_IME_NAME_KEYBOARD_RUSSIAN" desc="The input method name shows in system tray menu, this shows [Russian keyboard].">
     Russian keyboard
   </message>

diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
@@ -166,6 +166,8 @@ const struct InputMethodNameMap {
       {"__MSG_KEYBOARD_PERSIAN__", IDS_IME_NAME_KEYBOARD_PERSIAN},
       {"__MSG_KEYBOARD_POLISH__", IDS_IME_NAME_KEYBOARD_POLISH},
       {"__MSG_KEYBOARD_PORTUGUESE__", IDS_IME_NAME_KEYBOARD_PORTUGUESE},
+      {"__MSG_KEYBOARD_ROMANIAN_STANDARD__",
+       IDS_IME_NAME_KEYBOARD_ROMANIAN_STANDARD},
       {"__MSG_KEYBOARD_ROMANIAN__", IDS_IME_NAME_KEYBOARD_ROMANIAN},
       {"__MSG_KEYBOARD_RUSSIAN_PHONETIC_AATSEEL__",
        IDS_IME_NAME_KEYBOARD_RUSSIAN_PHONETIC_AATSEEL},

diff --git a/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json b/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json
@@ -535,6 +535,16 @@
       "input_view": "inputview.html#id=ro&language=ro&passwordLayout=ro&name=keyboard_romanian",
       "options_page": "hmm_options.html?code=xkb:ro::rum"
     },
+    {
+      "name": "__MSG_keyboard_romanian_standard__",
+      "type": "ime",
+      "id": "xkb:ro:std:rum",
+      "description": "",
+      "language": ["ro"],
+      "layouts": ["ro(std)"],
+      "input_view": "inputview.html#id=ro-std&language=ro&passwordLayout=ro-std&name=keyboard_romanian_standard",
+      "options_page": "hmm_options.html?code=xkb:ro:std:rum"
+    },
     {
       "name": "__MSG_keyboard_swedish__",
       "type": "ime",

diff --git a/chromeos/ime/input_methods.txt b/chromeos/ime/input_methods.txt
@@ -110,6 +110,7 @@ xkb:no::nob           no             nb,nn,no  NO login
 xkb:pl::pol           pl             pl        PL login
 xkb:pt::por           pt             pt-PT,pt  PT login
 xkb:ro::rum           ro             ro        RO login
+xkb:ro:std:rum        ro(std)        ro        RO login
 xkb:se::swe           se             sv        SE login
 xkb:sk::slo           sk             sk        SK
 xkb:si::slv           si             sl        SI login

diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
@@ -49177,9 +49177,10 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="111200" label="xkb:pl::pol">Polish keyboard</int>
   <int value="111201" label="xkb:pt::por">Portuguese keyboard</int>
   <int value="111400" label="xkb:ro::rum">Romanian keyboard</int>
-  <int value="111401" label="xkb:rs::srp">Serbian keyboard</int>
-  <int value="111402" label="xkb:ru::rus">Russian keyboard</int>
-  <int value="111403" label="xkb:ru:phonetic:rus">
+  <int value="111401" label="xkb:ro:std:rum">Romanian Standard keyboard</int>
+  <int value="111402" label="xkb:rs::srp">Serbian keyboard</int>
+  <int value="111403" label="xkb:ru::rus">Russian keyboard</int>
+  <int value="111404" label="xkb:ru:phonetic:rus">
     Russian Phonetic keyboard
   </int>
   <int value="111500" label="xkb:se::swe">Swedish keyboard</int>