Chromium Code Reviews| Index: chrome/browser/chromeos/input_method/input_method_manager_impl.cc |
| diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc |
| index 32504e4612e0b47d5e32cb729c8b1841ea7992a6..7494515097ceaf99492567c5c907adc5cd28b791 100644 |
| --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc |
| +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc |
| @@ -422,7 +422,8 @@ void InputMethodManagerImpl::StateImpl::ChangeInputMethod( |
| // Always change input method even if it is the same. |
| // TODO(komatsu): Revisit if this is neccessary. |
| if (IsActive()) |
| - manager_->ChangeInputMethodInternal(*descriptor, show_message, notify_menu); |
| + manager_->ChangeInputMethodInternal(*descriptor, profile, show_message, |
|
Shu Chen
2015/05/06 02:25:38
Where is |profile| defined?
Shu Chen
2015/05/06 06:14:14
Please ignore this. I found it is this->profile.
|
| + notify_menu); |
| manager_->RecordInputMethodUsage(current_input_method.id()); |
| } |
| @@ -825,9 +826,8 @@ void InputMethodManagerImpl::SetState( |
| // Always call ChangeInputMethodInternal even when the input method id |
| // remain unchanged, because onActivate event needs to be sent to IME |
| // extension to update the current screen type correctly. |
| - ChangeInputMethodInternal(state_->current_input_method, |
| - false /* show_message */, |
| - true /* notify_menu */); |
| + ChangeInputMethodInternal(state_->current_input_method, state_->profile, |
| + false /* show_message */, true /* notify_menu */); |
| } |
| } |
| @@ -975,6 +975,7 @@ const InputMethodDescriptor* InputMethodManagerImpl::LookupInputMethod( |
| void InputMethodManagerImpl::ChangeInputMethodInternal( |
| const InputMethodDescriptor& descriptor, |
| + Profile* profile, |
| bool show_message, |
| bool notify_menu) { |
| // No need to switch input method when terminating. |
| @@ -1033,9 +1034,8 @@ void InputMethodManagerImpl::ChangeInputMethodInternal( |
| } |
| // Update input method indicators (e.g. "US", "DV") in Chrome windows. |
| - FOR_EACH_OBSERVER(InputMethodManager::Observer, |
| - observers_, |
| - InputMethodChanged(this, show_message)); |
| + FOR_EACH_OBSERVER(InputMethodManager::Observer, observers_, |
| + InputMethodChanged(this, profile, show_message)); |
| } |
| void InputMethodManagerImpl::LoadNecessaryComponentExtensions( |