Fix Incognito input method handling.

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 266 matching lines @@
     const std::string& input_method_id) {
   ChangeInputMethodInternal(input_method_id, false);
 }
 
 bool InputMethodManagerImpl::ChangeInputMethodInternal(
     const std::string& input_method_id,
     bool show_message) {
   if (state_ == STATE_TERMINATING)
     return false;
 
-  if (!component_extension_ime_manager_->IsInitialized() ||
-      (!InputMethodUtil::IsKeyboardLayout(input_method_id) &&
-       !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;
-    return false;
-  }
-
   std::string input_method_id_to_switch = input_method_id;
 
   // Sanity check.
   if (!InputMethodIsActivated(input_method_id)) {
     scoped_ptr<InputMethodDescriptors> input_methods(GetActiveInputMethods());
     DCHECK(!input_methods->empty());
     input_method_id_to_switch = input_methods->at(0).id();
     if (!input_method_id.empty()) {
       DVLOG(1) << "Can't change the current input method to "
                << input_method_id << " since the engine is not enabled. "
                << "Switch to " << input_method_id_to_switch << " instead.";
     }
   }
 
+  if (!component_extension_ime_manager_->IsInitialized() ||
+      (!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;
+  }
+
   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 543 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