Refactoring for InputMethodEngine and InputMethodEventRouter.

chrome/browser/extensions/api/input_ime/input_ime_api.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_EXTENSIONS_API_INPUT_IME_INPUT_IME_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_INPUT_IME_INPUT_IME_API_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 18 matching lines @@
 }  // namespace chromeos
 
 namespace extensions {
 class ExtensionRegistry;
 struct InputComponentInfo;
 
 class InputImeEventRouter {
  public:
   static InputImeEventRouter* GetInstance();
 
-  bool RegisterIme(Profile*,
-                   const std::string& extension_id,
-                   const extensions::InputComponentInfo& component);
+  bool RegisterImeExtension(
+      const std::string& extension_id,
+      const std::vector<extensions::InputComponentInfo>& input_components);
   void UnregisterAllImes(const std::string& extension_id);
+
   chromeos::InputMethodEngineInterface* GetEngine(
       const std::string& extension_id,
-      const std::string& engine_id);
+      const std::string& component_id);
   chromeos::InputMethodEngineInterface* GetActiveEngine(
       const std::string& extension_id);
 
 
   // Called when a key event was handled.
   void OnKeyEventHandled(const std::string& extension_id,
                          const std::string& request_id,
                          bool handled);
 
-  std::string AddRequest(const std::string& engine_id,
+  std::string AddRequest(const std::string& component_id,
                          chromeos::input_method::KeyEventHandle* key_data);
 
  private:
   friend struct DefaultSingletonTraits<InputImeEventRouter>;
   typedef std::map<std::string, std::pair<std::string,
           chromeos::input_method::KeyEventHandle*> > RequestMap;
 
   InputImeEventRouter();
   ~InputImeEventRouter();
 
-  // The engine map for event routing.
-  //   { Profile : { extension_id : { engine_id : Engine } } }.
-  // TODO(shuchen): reuse the engine map in InputMethodManagerImpl.
-  typedef std::map<std::string, chromeos::InputMethodEngineInterface*>
-      EngineMap;
-  typedef std::map<std::string, EngineMap> ExtensionMap;
-  typedef std::map<Profile*, ExtensionMap, ProfileCompare>
-      ProfileEngineMap;
-  ProfileEngineMap profile_engine_map_;
+  std::map<std::string, chromeos::InputMethodEngineInterface*> engine_map_;

[Yuki, 2014/08/06 04:42:24]

Better to have a comment here, too.
Say that the key is extension_id.

[Shu Chen, 2014/08/06 05:45:03]

Done.

 
   unsigned int next_request_id_;
   RequestMap request_map_;
 
   DISALLOW_COPY_AND_ASSIGN(InputImeEventRouter);
 };
 
 class InputImeSetCompositionFunction : public SyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("input.ime.setComposition",
@@ skipping 169 matching lines @@
   content::BrowserContext* const browser_context_;
 
   // Listen to extension load, unloaded notifications.
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       extension_registry_observer_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_INPUT_IME_INPUT_IME_API_H_