[IME] Removes the duplicated IMEs in chrome://settings/languages, and support async component IMEs …

chrome/browser/chromeos/input_method/input_method_util.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
 
 #include <cstddef>
 #include <map>
 #include <string>
@@ skipping 122 matching lines @@
 
   // Returns true if the given input method id is supported.
   bool IsValidInputMethodId(const std::string& input_method_id) const;
 
   // Returns true if the given input method id is for a keyboard layout.
   static bool IsKeyboardLayout(const std::string& input_method_id);
 
   // Sets the list of component extension IMEs.
   void SetComponentExtensions(const InputMethodDescriptors& imes);
 
+  // Initializes the extension based xkb IMEs for testing.
+  void InitXkbInputMethodsForTesting();
+
   // Returns the fallback input method descriptor (the very basic US
   // keyboard). This function is mostly used for testing, but may be used
   // as the fallback, when there is no other choice.
   static InputMethodDescriptor GetFallbackInputMethodDescriptor();
 
  protected:
   // protected: for unit testing as well.
   bool GetInputMethodIdsFromLanguageCodeInternal(
       const std::multimap<std::string, std::string>& language_code_to_ids,
       const std::string& normalized_language_code,
@@ skipping 30 matching lines @@
     std::string, InputMethodDescriptor> InputMethodIdToDescriptorMap;
   // Map from XKB layout ID to associated input method descriptor.
   typedef std::map<std::string, InputMethodDescriptor> XkbIdToDescriptorMap;
   // Map from component extention IME id to associated input method descriptor.
   typedef std::map<std::string, InputMethodDescriptor> ComponentExtIMEMap;
 
   LanguageCodeToIdsMap language_code_to_ids_;
   std::map<std::string, std::string> id_to_language_code_;
   InputMethodIdToDescriptorMap id_to_descriptor_;
   XkbIdToDescriptorMap xkb_id_to_descriptor_;
-  ComponentExtIMEMap component_extension_ime_id_to_descriptor_;
+  std::map<std::string, std::string> xkb_layout_to_indicator_;
 
   typedef base::hash_map<std::string, int> HashType;
   HashType english_to_resource_id_;
 
   InputMethodDelegate* delegate_;
 
   base::ThreadChecker thread_checker_;
   std::vector<std::string> hardware_layouts_;
   std::vector<std::string> hardware_login_layouts_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodUtil);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_