Revert "Revert "Use libcros to convert input method ID to keyboard overlay ID.""

chrome/browser/chromeos/cros/input_method_library.cc

 // Copyright (c) 2010 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/cros/input_method_library.h"
 
 #include <glib.h>
 #include <signal.h>
 
 #include "unicode/uloc.h"
@@ skipping 173 matching lines @@
     return previous_input_method_;
   }
   virtual const InputMethodDescriptor& current_input_method() const {
     return current_input_method_;
   }
 
   virtual const ImePropertyList& current_ime_properties() const {
     return current_ime_properties_;
   }
 
+  virtual std::string GetKeyboardOverlayId(const std::string& input_method_id) {
+    if (EnsureLoadedAndStarted()) {
+      return chromeos::GetKeyboardOverlayId(input_method_id);
+    }
+    return "";
+  }
+
  private:
   // Starts input method processes based on the |defer_ime_startup_| flag and
   // input method configuration being updated. |section| is a section name of
   // the input method configuration (e.g. "general", "general/hotkey").
   // |config_name| is a name of the configuration (e.g. "preload_engines",
   // "previous_engine"). |value| is the configuration value to be set.
   void MaybeStartInputMethodProcesses(const std::string& section,
                                       const std::string& config_name,
                                       const ImeConfigValue& value) {
     if (section == language_prefs::kGeneralSectionName &&
@@ skipping 467 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodLibraryImpl);
 };
 
 InputMethodLibraryImpl::Observer::~Observer() {}
 
 class InputMethodLibraryStubImpl : public InputMethodLibrary {
  public:
   InputMethodLibraryStubImpl()
       : previous_input_method_("", "", "", ""),
-        current_input_method_("", "", "", "") {
+        current_input_method_("", "", "", ""),
+        keyboard_overlay_map_(
+            CreateRealisticKeyboardOverlayMap()) {
   }
 
   ~InputMethodLibraryStubImpl() {}
   void AddObserver(Observer* observer) {}
   void RemoveObserver(Observer* observer) {}
 
   InputMethodDescriptors* GetActiveInputMethods() {
     return CreateRealisticInputMethodDescriptors();
   }
 
@@ skipping 37 matching lines @@
 
   virtual const ImePropertyList& current_ime_properties() const {
     return current_ime_properties_;
   }
 
   virtual void StartInputMethodProcesses() {}
   virtual void StopInputMethodProcesses() {}
   virtual void SetDeferImeStartup(bool defer) {}
   virtual void SetEnableAutoImeShutdown(bool enable) {}
 
+  virtual std::string GetKeyboardOverlayId(const std::string& input_method_id) {
+    KeyboardOverlayMap::const_iterator iter =
+        keyboard_overlay_map_->find(input_method_id);
+    return (iter != keyboard_overlay_map_->end()) ?
+        iter->second : "";
+  }
+
  private:
+  typedef std::map<std::string, std::string> KeyboardOverlayMap;
+
   // Creates realistic input method descriptors that can be used for
   // testing Chrome OS version of chrome on regular Linux desktops.
   InputMethodDescriptors* CreateRealisticInputMethodDescriptors() {
     InputMethodDescriptors* descriptions = new InputMethodDescriptors;
     // The list is created from output of gen_engines.py in libcros.
     descriptions->push_back(InputMethodDescriptor(
         "chewing", "Chewing", "us", "zh_TW"));
     descriptions->push_back(InputMethodDescriptor(
         "hangul", "Korean", "us", "ko"));
     descriptions->push_back(InputMethodDescriptor(
@@ skipping 108 matching lines @@
     descriptions->push_back(InputMethodDescriptor(
         "xkb:tr::tur", "Turkey", "tr", "tur"));
     descriptions->push_back(InputMethodDescriptor(
         "xkb:ua::ukr", "Ukraine", "ua", "ukr"));
     descriptions->push_back(InputMethodDescriptor(
         "xkb:gb:extd:eng", "United Kingdom - Extended - Winkeys", "gb(extd)",
         "eng"));
     return descriptions;
   }
 
+  std::map<std::string, std::string>* CreateRealisticKeyboardOverlayMap() {
+    KeyboardOverlayMap* keyboard_overlay_map =
+        new KeyboardOverlayMap;
+    (*keyboard_overlay_map)["xkb:nl::nld"] = "nl";
+    (*keyboard_overlay_map)["xkb:be::nld"] = "nl";
+    (*keyboard_overlay_map)["xkb:fr::fra"] = "fr";
+    (*keyboard_overlay_map)["xkb:be::fra"] = "fr";
+    (*keyboard_overlay_map)["xkb:ca::fra"] = "fr_CA";
+    (*keyboard_overlay_map)["xkb:ch:fr:fra"] = "fr";
+    (*keyboard_overlay_map)["xkb:de::ger"] = "de";
+    (*keyboard_overlay_map)["xkb:be::ger"] = "de";
+    (*keyboard_overlay_map)["xkb:ch::ger"] = "de";
+    (*keyboard_overlay_map)["mozc"] = "en_US";
+    (*keyboard_overlay_map)["mozc-jp"] = "ja";
+    (*keyboard_overlay_map)["mozc-dv"] = "en_US_dvorak";
+    (*keyboard_overlay_map)["xkb:jp::jpn"] = "ja";
+    (*keyboard_overlay_map)["xkb:ru::rus"] = "ru";
+    (*keyboard_overlay_map)["xkb:ru:phonetic:rus"] = "ru";
+    (*keyboard_overlay_map)["m17n:th:kesmanee"] = "th";
+    (*keyboard_overlay_map)["m17n:th:pattachote"] = "th";
+    (*keyboard_overlay_map)["m17n:th:tis820"] = "th";
+    (*keyboard_overlay_map)["chewing"] = "zh_TW";
+    (*keyboard_overlay_map)["m17n:zh:cangjie"] = "zh_TW";
+    (*keyboard_overlay_map)["m17n:zh:quick"] = "zh_TW";
+    (*keyboard_overlay_map)["m17n:vi:tcvn"] = "vi";
+    (*keyboard_overlay_map)["m17n:vi:telex"] = "vi";
+    (*keyboard_overlay_map)["m17n:vi:viqr"] = "vi";
+    (*keyboard_overlay_map)["m17n:vi:vni"] = "vi";
+    (*keyboard_overlay_map)["xkb:us::eng"] = "en_US";
+    (*keyboard_overlay_map)["xkb:us:intl:eng"] = "en_US";
+    (*keyboard_overlay_map)["xkb:us:altgr-intl:eng"] = "en_US";
+    (*keyboard_overlay_map)["xkb:us:dvorak:eng"] =
+        "en_US_dvorak";
+    (*keyboard_overlay_map)["xkb:us:colemak:eng"] =
+        "en_US";
+    (*keyboard_overlay_map)["hangul"] = "ko";
+    (*keyboard_overlay_map)["pinyin"] = "zh_CN";
+    (*keyboard_overlay_map)["m17n:ar:kbd"] = "ar";
+    (*keyboard_overlay_map)["m17n:hi:itrans"] = "hi";
+    (*keyboard_overlay_map)["m17n:fa:isiri"] = "ar";
+    (*keyboard_overlay_map)["xkb:br::por"] = "pt_BR";
+    (*keyboard_overlay_map)["xkb:bg::bul"] = "bg";
+    (*keyboard_overlay_map)["xkb:bg:phonetic:bul"] = "bg";
+    (*keyboard_overlay_map)["xkb:ca:eng:eng"] = "ca";
+    (*keyboard_overlay_map)["xkb:cz::cze"] = "cs";
+    (*keyboard_overlay_map)["xkb:ee::est"] = "et";
+    (*keyboard_overlay_map)["xkb:es::spa"] = "es";
+    (*keyboard_overlay_map)["xkb:es:cat:cat"] = "ca";
+    (*keyboard_overlay_map)["xkb:dk::dan"] = "da";
+    (*keyboard_overlay_map)["xkb:gr::gre"] = "el";
+    (*keyboard_overlay_map)["xkb:il::heb"] = "iw";
+    (*keyboard_overlay_map)["xkb:kr:kr104:kor"] = "ko";
+    (*keyboard_overlay_map)["xkb:latam::spa"] = "es_419";
+    (*keyboard_overlay_map)["xkb:lt::lit"] = "lt";
+    (*keyboard_overlay_map)["xkb:lv:apostrophe:lav"] = "lv";
+    (*keyboard_overlay_map)["xkb:hr::scr"] = "hr";
+    (*keyboard_overlay_map)["xkb:gb:extd:eng"] = "en_GB";
+    (*keyboard_overlay_map)["xkb:fi::fin"] = "fi";
+    (*keyboard_overlay_map)["xkb:hu::hun"] = "hu";
+    (*keyboard_overlay_map)["xkb:it::ita"] = "it";
+    (*keyboard_overlay_map)["xkb:no::nob"] = "no";
+    (*keyboard_overlay_map)["xkb:pl::pol"] = "pl";
+    (*keyboard_overlay_map)["xkb:pt::por"] = "pt_PT";
+    (*keyboard_overlay_map)["xkb:ro::rum"] = "ro";
+    (*keyboard_overlay_map)["xkb:se::swe"] = "sv";
+    (*keyboard_overlay_map)["xkb:sk::slo"] = "sk";
+    (*keyboard_overlay_map)["xkb:si::slv"] = "sl";
+    (*keyboard_overlay_map)["xkb:rs::srp"] = "sr";
+    (*keyboard_overlay_map)["xkb:tr::tur"] = "tr";
+    (*keyboard_overlay_map)["xkb:ua::ukr"] = "uk";
+    return keyboard_overlay_map;
+  }
+
   InputMethodDescriptor previous_input_method_;
   InputMethodDescriptor current_input_method_;
   ImePropertyList current_ime_properties_;
+  scoped_ptr<KeyboardOverlayMap> keyboard_overlay_map_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodLibraryStubImpl);
 };
 
 // static
 InputMethodLibrary* InputMethodLibrary::GetImpl(bool stub) {
   if (stub)
     return new InputMethodLibraryStubImpl();
   else
     return new InputMethodLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::InputMethodLibraryImpl);