Add pinyin-dv support.

chrome/browser/chromeos/input_method/input_method_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <utility>
@@ skipping 155 matching lines @@
     IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_TCVN_INPUT_METHOD },
   { "telex (m17n)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_TELEX_INPUT_METHOD },
   { "viqr (m17n)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_VIQR_INPUT_METHOD },
   { "vni (m17n)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_VIETNAMESE_VNI_INPUT_METHOD },
   { "Mozc Chewing (Chewing)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_INPUT_METHOD },
   { "Pinyin", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_INPUT_METHOD },
+  { "Pinyin (for US Dvorak keyboard)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DV_INPUT_METHOD },
   { "Mozc (US keyboard layout)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_MOZC_US_INPUT_METHOD },
   { "Mozc (US Dvorak keyboard layout)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_MOZC_US_DV_INPUT_METHOD },
   { "Mozc (Japanese keyboard layout)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_MOZC_JP_INPUT_METHOD },
   { "Google Japanese Input (US keyboard layout)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_GOOGLE_US_INPUT_METHOD },
   { "Google Japanese Input (US Dvorak keyboard layout)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_GOOGLE_US_DV_INPUT_METHOD },
@@ skipping 257 matching lines @@
 bool IsKeyboardLayout(const std::string& input_method_id) {
   const bool kCaseInsensitive = false;
   return StartsWithASCII(input_method_id, "xkb:", kCaseInsensitive);
 }
 
 std::string GetLanguageCodeFromDescriptor(
     const InputMethodDescriptor& descriptor) {
   // Handle some Chinese input methods as zh-CN/zh-TW, rather than zh.
   // TODO: we should fix this issue in engines rather than here.
   if (descriptor.language_code == "zh") {
-    if (descriptor.id == "pinyin") {
+    if (descriptor.id == "pinyin" || descriptor.id == "pinyin-dv") {
       return "zh-CN";
     } else if (descriptor.id == "mozc-chewing" ||
                descriptor.id == "m17n:zh:cangjie" ||
                descriptor.id == "m17n:zh:quick") {
       return "zh-TW";
     }
+    LOG(ERROR) << "Unhandled Chinese engine: " << descriptor.id;
   }
 
   std::string language_code = NormalizeLanguageCode(descriptor.language_code);
 
   // Add country codes to language codes of some XKB input methods to make
   // these compatible with Chrome's application locale codes like "en-US".
   // TODO(satorux): Maybe we need to handle "es" for "es-419".
   // TODO: We should not rely on the format of the engine name. Should we add
   //       |country_code| in InputMethodDescriptor?
   if (IsKeyboardLayout(descriptor.id) &&
@@ skipping 264 matching lines @@
 void ReloadInternalMaps() {
   IdMaps::GetInstance()->ReloadMaps();
 }
 
 void OnLocaleChanged() {
   ReloadInternalMaps();
 }
 
 }  // namespace input_method
 }  // namespace chromeos