summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-12 02:08:48 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-12 02:08:48 +0000
commit83a18417667c673f30ca30a59cbbec2dd54c82d9 (patch)
treec9074c9280ec327e4804e62b38776cdf4b02b50b /chrome/browser
parentc90372fa19f256a98605cca17d81ece0d0f7622f (diff)
downloadchromium_src-83a18417667c673f30ca30a59cbbec2dd54c82d9.zip
chromium_src-83a18417667c673f30ca30a59cbbec2dd54c82d9.tar.gz
chromium_src-83a18417667c673f30ca30a59cbbec2dd54c82d9.tar.bz2
Bug fix: Reset keyboard layout to hardware keyboard when IME is killed.
BUG=chromium-os:5224 TEST=See bug for details Review URL: http://codereview.chromium.org/3113009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chromeos/cros/input_method_library.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/cros/input_method_library.cc b/chrome/browser/chromeos/cros/input_method_library.cc
index c5d7573..f84e3c7 100644
--- a/chrome/browser/chromeos/cros/input_method_library.cc
+++ b/chrome/browser/chromeos/cros/input_method_library.cc
@@ -442,6 +442,8 @@ class InputMethodLibraryImpl : public InputMethodLibrary {
void StopInputMethodProcesses() {
ime_running_ = false;
if (ime_handle_) {
+ chromeos::ChangeInputMethod(input_method_status_connection_,
+ kHardwareKeyboardLayout);
kill(ime_handle_, SIGTERM);
ime_handle_ = 0;
}