Add GetInputMethodDescriptorFromXkbId function.

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 20 matching lines @@
 namespace chromeos {
 namespace input_method {
 
 namespace {
 
 // Map from language code to associated input method IDs, etc.
 typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap;
 // Map from input method ID to associated input method descriptor.
 typedef std::map<std::string, InputMethodDescriptor>
     InputMethodIdToDescriptorMap;
+// Map from XKB layout ID to associated input method descriptor.
+typedef std::map<std::string, InputMethodDescriptor> XkbIdToDescriptorMap;
 
 struct IdMaps {
   scoped_ptr<LanguageCodeToIdsMap> language_code_to_ids;
   scoped_ptr<std::map<std::string, std::string> > id_to_language_code;
   scoped_ptr<InputMethodIdToDescriptorMap> id_to_descriptor;
+  scoped_ptr<XkbIdToDescriptorMap> xkb_id_to_descriptor;
 
   // Returns the singleton instance.
   static IdMaps* GetInstance() {
     return Singleton<IdMaps>::get();
   }
 
   void ReloadMaps() {
     scoped_ptr<InputMethodDescriptors> supported_input_methods(
         GetSupportedInputMethods());
     if (supported_input_methods->size() <= 1) {
       LOG(ERROR) << "GetSupportedInputMethods returned a fallback ID";
       // TODO(yusukes): Handle this error in nicer way.
     }
 
     // Clear the existing maps.
     language_code_to_ids->clear();
     id_to_language_code->clear();
     id_to_descriptor->clear();
+    xkb_id_to_descriptor->clear();
 
     for (size_t i = 0; i < supported_input_methods->size(); ++i) {
       const InputMethodDescriptor& input_method =
           supported_input_methods->at(i);
       const std::string language_code =
           GetLanguageCodeFromDescriptor(input_method);
       language_code_to_ids->insert(
           std::make_pair(language_code, input_method.id()));
       // Remember the pairs.
       id_to_language_code->insert(
           std::make_pair(input_method.id(), language_code));
       id_to_descriptor->insert(
           std::make_pair(input_method.id(), input_method));
+      if (IsKeyboardLayout(input_method.id())) {
+        xkb_id_to_descriptor->insert(
+            std::make_pair(input_method.keyboard_layout(), input_method));
+      }
     }
 
     // Go through the languages listed in kExtraLanguages.
     for (size_t i = 0; i < kExtraLanguagesLength; ++i) {
       const char* language_code = kExtraLanguages[i].language_code;
       const char* input_method_id = kExtraLanguages[i].input_method_id;
       InputMethodIdToDescriptorMap::const_iterator iter =
           id_to_descriptor->find(input_method_id);
       // If the associated input method descriptor is found, add the
       // language code and the input method.
       if (iter != id_to_descriptor->end()) {
         const InputMethodDescriptor& input_method = iter->second;
         language_code_to_ids->insert(
             std::make_pair(language_code, input_method.id()));
       }
     }
   }
 
  private:
   IdMaps() : language_code_to_ids(new LanguageCodeToIdsMap),
              id_to_language_code(new std::map<std::string, std::string>),
-             id_to_descriptor(new InputMethodIdToDescriptorMap) {
+             id_to_descriptor(new InputMethodIdToDescriptorMap),
+             xkb_id_to_descriptor(new XkbIdToDescriptorMap) {
     ReloadMaps();
   }
 
   friend struct DefaultSingletonTraits<IdMaps>;
 
   DISALLOW_COPY_AND_ASSIGN(IdMaps);
 };
 
 const struct EnglishToResouceId {
   const char* english_string_from_ibus;
@@ skipping 402 matching lines @@
 }
 
 const InputMethodDescriptor* GetInputMethodDescriptorFromId(
     const std::string& input_method_id) {
   InputMethodIdToDescriptorMap::const_iterator iter
       = IdMaps::GetInstance()->id_to_descriptor->find(input_method_id);
   return (iter == IdMaps::GetInstance()->id_to_descriptor->end()) ?
       NULL : &(iter->second);
 }
 
+const InputMethodDescriptor* GetInputMethodDescriptorFromXkbId(
+    const std::string& xkb_id) {
+  InputMethodIdToDescriptorMap::const_iterator iter
+      = IdMaps::GetInstance()->xkb_id_to_descriptor->find(xkb_id);
+  return (iter == IdMaps::GetInstance()->xkb_id_to_descriptor->end()) ?
+      NULL : &(iter->second);
+}
+
 string16 GetLanguageDisplayNameFromCode(const std::string& language_code) {
   if (!g_browser_process) {
     return string16();
   }
   return l10n_util::GetDisplayNameForLocale(
       language_code, g_browser_process->GetApplicationLocale(), true);
 }
 
 string16 GetLanguageNativeDisplayNameFromCode(
     const std::string& language_code) {
@@ skipping 214 matching lines @@
 void ReloadInternalMaps() {
   IdMaps::GetInstance()->ReloadMaps();
 }
 
 void OnLocaleChanged() {
   ReloadInternalMaps();
 }
 
 }  // namespace input_method
 }  // namespace chromeos