Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3110)

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.cc

Issue 576503002: Remove implicit conversions from scoped_refptr to T* in c/b/chromeos/input_method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698