Refactoring for InputMethodEngine and InputMethodEventRouter.

chrome/browser/chromeos/input_method/input_method_manager_impl.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_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 47 matching lines @@
   virtual void EnableLoginLayouts(
       const std::string& language_code,
       const std::vector<std::string>& initial_layouts) OVERRIDE;
   virtual bool ReplaceEnabledInputMethods(
       const std::vector<std::string>& new_active_input_method_ids) OVERRIDE;
   virtual bool EnableInputMethod(const std::string& new_active_input_method_id)
       OVERRIDE;
   virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE;
   virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE;
   virtual void AddInputMethodExtension(
-      Profile* profile,
-      const std::string& id,
+      const std::string& extension_id,
+      const InputMethodDescriptors& descriptors,
       InputMethodEngineInterface* instance) OVERRIDE;
-  virtual void RemoveInputMethodExtension(Profile* profile,
-                                          const std::string& id) OVERRIDE;
+  virtual void RemoveInputMethodExtension(
+      const std::string& extension_id) OVERRIDE;
   virtual void GetInputMethodExtensions(
       InputMethodDescriptors* result) OVERRIDE;
   virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) OVERRIDE;
   virtual void SetInputMethodLoginDefault() OVERRIDE;
   virtual void SetInputMethodLoginDefaultFromVPD(
       const std::string& locale, const std::string& layout) OVERRIDE;
   virtual bool SwitchToNextInputMethod() OVERRIDE;
   virtual bool SwitchToPreviousInputMethod(
       const ui::Accelerator& accelerator) OVERRIDE;
   virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE;
@@ skipping 66 matching lines @@
 
   // Adds new input method to given list if possible
   bool EnableInputMethodImpl(
       const std::string& input_method_id,
       std::vector<std::string>* new_active_input_method_ids) const;
 
   // Starts or stops the system input method framework as needed.
   // (after list of enabled input methods has been updated)
   void ReconfigureIMFramework();
 
-  // Gets the current active user profile.
-  // Note: this method is deprecated as ActiveUserProfile might change
-  // during asynchronous operations that leads to strange crashes.
-  // Use with caution!
-  Profile* GetProfile() const;
-
   scoped_ptr<InputMethodDelegate> delegate_;
 
   // The current browser status.
   State state_;
 
   // A list of objects that monitor the manager.
   ObserverList<InputMethodManager::Observer> observers_;
   ObserverList<CandidateWindowObserver> candidate_window_observers_;
 
   // The input method which was/is selected.
@@ skipping 26 matching lines @@
 
   // An object which provides component extension ime management functions.
   scoped_ptr<ComponentExtensionIMEManager> component_extension_ime_manager_;
 
   // An object for switching XKB layouts and keyboard status like caps lock and
   // auto-repeat interval.
   scoped_ptr<ImeKeyboard> keyboard_;
 
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<InputMethodManagerImpl> weak_ptr_factory_;

[Alexander Alekseev, 2014/08/06 20:48:28]

This should be the last member.

[Shu Chen, 2014/08/07 00:44:28]

I don't see any code is using it. Probably it should be removed?

 
-  // The engine map:
-  //   { Profile : { input_method_id : Engine } }.
-  typedef std::map<std::string, InputMethodEngineInterface*>
-      EngineMap;
-  typedef std::map<Profile*, EngineMap, ProfileCompare> ProfileEngineMap;
-  ProfileEngineMap profile_engine_map_;
+  // The engine map from extension_id to an engine.
+  std::map<std::string, InputMethodEngineInterface*> engine_map_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_