Explicitly set the input method on IME connected, even if it's the hardware layout.

chrome/browser/chromeos/cros/input_method_library.cc

 // Copyright (c) 2010 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/cros/input_method_library.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 253 matching lines @@
 void InputMethodLibraryImpl::ConnectionChangeHandler(void* object,
                                                      bool connected) {
   InputMethodLibraryImpl* input_method_library =
       static_cast<InputMethodLibraryImpl*>(object);
   input_method_library->ime_connected_ = connected;
   if (connected) {
     input_method_library->pending_config_requests_.clear();
     input_method_library->pending_config_requests_.insert(
         input_method_library->current_config_values_.begin(),
         input_method_library->current_config_values_.end());
-    // When the IME process starts up, the hardware layout will be the current
-    // method.  If this is not correct, we'll need to explicitly change it.
-    if (input_method_library->active_input_method_ != kHardwareKeyboardLayout) {
-      input_method_library->need_input_method_set_ = true;
-    }
+    input_method_library->need_input_method_set_ = true;
     input_method_library->FlushImeConfig();
   } else {
     // Stop attempting to resend config data, since it will continue to fail.
     input_method_library->timer_.Stop();  // no-op if it's not running.
   }
 }
 
 bool InputMethodLibraryImpl::EnsureStarted() {
   if (!input_method_status_connection_) {
     input_method_status_connection_ = chromeos::MonitorInputMethodStatus(
@@ skipping 160 matching lines @@
   if (library->ime_handle_ == pid) {
     library->ime_handle_ = 0;
   } else if (library->candidate_window_handle_ == pid) {
     library->candidate_window_handle_ = 0;
   }
 
   library->MaybeLaunchIme();
 }
 
 }  // namespace chromeos