Fix some typos from a bad merge.

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 89 matching lines @@
       result = chromeos::GetSupportedInputMethods(
           input_method_status_connection_);
     }
     if (!result || result->empty()) {
       result = CreateFallbackInputMethodDescriptors();
     }
     return result;
   }
 
   void ChangeInputMethod(const std::string& input_method_id) {
+    active_input_method_ = input_method_id;
     if (EnsureLoadedAndStarted()) {
       if (input_method_id != kHardwareKeyboardLayout) {
         StartInputMethodProcesses();
       }
       chromeos::ChangeInputMethod(
           input_method_status_connection_, input_method_id.c_str());
     }
   }
 
-  void SetImePropertyActivated(const std::string& key,
-                                                       bool activated) {
+  void SetImePropertyActivated(const std::string& key, bool activated) {
     DCHECK(!key.empty());
     if (EnsureLoadedAndStarted()) {
       chromeos::SetImePropertyActivated(
           input_method_status_connection_, key.c_str(), activated);
     }
   }
 
-  bool InputMethodIsActivated(
-      const std::string& input_method_id) {
+  bool InputMethodIsActivated(const std::string& input_method_id) {
     scoped_ptr<InputMethodDescriptors> active_input_method_descriptors(
         CrosLibrary::Get()->GetInputMethodLibrary()->GetActiveInputMethods());
     for (size_t i = 0; i < active_input_method_descriptors->size(); ++i) {
       if (active_input_method_descriptors->at(i).id == input_method_id) {
         return true;
       }
     }
     return false;
   }
 
-  bool GetImeConfig(
-      const char* section,
-      const char* config_name,
-      ImeConfigValue* out_value) {
+  bool GetImeConfig(const char* section, const char* config_name,
+                    ImeConfigValue* out_value) {
     bool success = false;
     if (EnsureLoadedAndStarted()) {
-      success = chromeos::GetImeConfig(
-          input_method_status_connection_, section, config_name, out_value);
+      success = chromeos::GetImeConfig(input_method_status_connection_,
+                                       section, config_name, out_value);
     }
     return success;
   }
 
-  bool SetImeConfig(
-      const char* section,
-      const char* config_name,
-      const ImeConfigValue& value) {
+  bool SetImeConfig(const char* section, const char* config_name,
+                    const ImeConfigValue& value) {
     MaybeUpdateImeState(section, config_name, value);
 
     const ConfigKeyType key = std::make_pair(section, config_name);
     current_config_values_[key] = value;
     if (ime_connected_) {
       pending_config_requests_[key] = value;
       FlushImeConfig();
     }
     return pending_config_requests_.empty();
   }
 
   virtual const InputMethodDescriptor& previous_input_method() const {
     return previous_input_method_;
   }
   virtual const InputMethodDescriptor& current_input_method() const {
     return current_input_method_;
   }
 
   virtual const ImePropertyList& current_ime_properties() const {
     return current_ime_properties_;
   }
 
-  void StartIme() {
-    ime_running_ = true;
-    MaybeLaunchIme();
-  }
-
-  void StopIme() {
-    ime_running_ = false;
-    if (ime_handle_) {
-      kill(ime_handle_, SIGTERM);
-      ime_handle_ = 0;
-    }
-    if (candidate_window_handle_) {
-      kill(candidate_window_handle_, SIGTERM);
-      candidate_window_handle_ = 0;
-    }
-  }
-
  private:
   void MaybeUpdateImeState(
       const char* section,
       const char* config_name,
       const ImeConfigValue& value) {
     if (!strcmp(kGeneralSectionName, section) &&
         !strcmp(kPreloadEnginesConfigName, config_name)) {
       if (EnsureLoadedAndStarted()) {
         if (value.type == ImeConfigValue::kValueTypeStringList &&
             value.string_list_value.size() == 1 &&
@@ skipping 255 matching lines @@
 
     library->MaybeLaunchIme();
   }
 
   void StopInputMethodProcesses() {
     ime_running_ = false;
     if (ime_handle_) {
       kill(ime_handle_, SIGTERM);
       ime_handle_ = 0;
     }
+    if (candidate_window_handle_) {
+      kill(candidate_window_handle_, SIGTERM);
+      candidate_window_handle_ = 0;
+    }
   }
 
   void SetDeferImeStartup(bool defer) {
     defer_ime_startup_ = defer;
   }
   // A reference to the language api, to allow callbacks when the input method
   // status changes.
   InputMethodStatusConnection* input_method_status_connection_;
   ObserverList<Observer> observers_;
 
@@ skipping 239 matching lines @@
     return new InputMethodLibraryStubImpl();
   else
     return new InputMethodLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::InputMethodLibraryImpl);