Index: chrome/browser/chromeos/input_method/input_method_manager_impl.h |
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h |
index 19847760d7a3ae86d83c5b15bf86e177e909eb83..e6b6a0fe77d7f35afd936dc065d280d08c77d7b7 100644 |
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h |
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h |
@@ -65,9 +65,11 @@ class InputMethodManagerImpl : public InputMethodManager, |
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, |
InputMethodEngineInterface* instance) OVERRIDE; |
- virtual void RemoveInputMethodExtension(const std::string& id) OVERRIDE; |
+ virtual void RemoveInputMethodExtension(Profile* profile, |
+ const std::string& id) OVERRIDE; |
virtual void GetInputMethodExtensions( |
InputMethodDescriptors* result) OVERRIDE; |
virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) OVERRIDE; |
@@ -101,6 +103,8 @@ class InputMethodManagerImpl : public InputMethodManager, |
scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate); |
private: |
+ friend class InputMethodManagerImplTest; |
+ |
// CandidateWindowController::Observer overrides: |
virtual void CandidateClicked(int index) OVERRIDE; |
virtual void CandidateWindowOpened() OVERRIDE; |
@@ -153,6 +157,9 @@ class InputMethodManagerImpl : public InputMethodManager, |
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_; |