Reset pending input method id.

chrome/browser/chromeos/input_method/input_method_manager_impl.cc

 // 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.
 
 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 
 #include <algorithm>  // std::find
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 291 matching lines @@
       (!InputMethodUtil::IsKeyboardLayout(input_method_id_to_switch) &&
        !IsIBusConnectionAlive())) {
     // We can't change input method before the initialization of component
     // extension ime manager or before connection to ibus-daemon is not
     // established. ChangeInputMethod will be called with
     // |pending_input_method_| when the both initialization is done.
     pending_input_method_ = input_method_id_to_switch;
     return false;
   }
 
+  pending_input_method_.clear();
   IBusInputContextClient* input_context =
       chromeos::DBusThreadManager::Get()->GetIBusInputContextClient();
   const std::string current_input_method_id = current_input_method_.id();
   IBusClient* client = DBusThreadManager::Get()->GetIBusClient();
   if (InputMethodUtil::IsKeyboardLayout(input_method_id_to_switch)) {
     FOR_EACH_OBSERVER(InputMethodManager::Observer,
                       observers_,
                       InputMethodPropertyChanged(this));
     // Hack for fixing http://crosbug.com/p/12798
     // We should notify IME switching to ibus-daemon, otherwise
@@ skipping 72 matching lines @@
 
 void InputMethodManagerImpl::OnComponentExtensionInitialized(
     scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate) {
   DCHECK(thread_checker_.CalledOnValidThread());
   component_extension_ime_manager_->Initialize(delegate.Pass());
   util_.SetComponentExtensions(
       component_extension_ime_manager_->GetAllIMEAsInputMethodDescriptor());
 
   LoadNecessaryComponentExtensions();
 
-  if (!pending_input_method_.empty()) {
-    if (ChangeInputMethodInternal(pending_input_method_, false))
-      pending_input_method_.clear();
-  }
+  if (!pending_input_method_.empty())
+    ChangeInputMethodInternal(pending_input_method_, false);
 
 }
 
 void InputMethodManagerImpl::LoadNecessaryComponentExtensions() {
   if (!component_extension_ime_manager_->IsInitialized())
     return;
   // Load component extensions but also update |active_input_method_ids_| as
   // some component extension IMEs may have been removed from the Chrome OS
   // image. If specified component extension IME no longer exists, falling back
   // to an existing IME.
@@ skipping 297 matching lines @@
           extra_input_method_instances_.begin();
        ite != extra_input_method_instances_.end();
        ite++) {
     if (Contains(enabled_extension_imes_, ite->first) ||
         (component_extension_ime_manager_->IsInitialized() &&
          component_extension_ime_manager_->IsWhitelisted(ite->first))) {
       ite->second->OnConnected();
     }
   }
 
-  if (!pending_input_method_.empty()) {
-    if (ChangeInputMethodInternal(pending_input_method_, false))
-      pending_input_method_.clear();
-  }
+  if (!pending_input_method_.empty())
+    ChangeInputMethodInternal(pending_input_method_, false);
 }
 
 void InputMethodManagerImpl::OnDisconnected() {
   for (std::map<std::string, InputMethodEngineIBus*>::iterator ite =
           extra_input_method_instances_.begin();
        ite != extra_input_method_instances_.end();
        ite++) {
     if (Contains(enabled_extension_imes_, ite->first))
       ite->second->OnDisconnected();
   }
@@ skipping 126 matching lines @@
   else
     DVLOG(1) << "Failed to initialize the candidate window controller";
 }
 
 bool InputMethodManagerImpl::IsIBusConnectionAlive() {
   return DBusThreadManager::Get() && DBusThreadManager::Get()->GetIBusClient();
 }
 
 }  // namespace input_method
 }  // namespace chromeos