| 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 eed7f793984c6cd017d4d9e63c7b6dc0fc86abe9..3c7c0c72f9fcae700520a2d763e735a5217d2b71 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
|
| @@ -741,16 +741,17 @@ void InputMethodManagerImpl::ReconfigureIMFramework(
|
|
|
| void InputMethodManagerImpl::SetState(
|
| scoped_refptr<InputMethodManager::State> state) {
|
| - DCHECK(state);
|
| + DCHECK(state.get());
|
| InputMethodManagerImpl::StateImpl* new_impl_state =
|
| static_cast<InputMethodManagerImpl::StateImpl*>(state.get());
|
| const bool need_update_current_input_method =
|
| - (state_ ? state_->current_input_method.id() !=
|
| - new_impl_state->current_input_method.id()
|
| - : true);
|
| + (state_.get()
|
| + ? state_->current_input_method.id() !=
|
| + new_impl_state->current_input_method.id()
|
| + : true);
|
| state_ = new_impl_state;
|
|
|
| - if (state_ && state_->active_input_method_ids.size()) {
|
| + if (state_.get() && state_->active_input_method_ids.size()) {
|
| // Initialize candidate window controller and widgets such as
|
| // candidate window, infolist and mode indicator. Note, mode
|
| // indicator is used by only keyboard layout input methods.
|
|
|