summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-08 04:49:54 +0000
committeryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-08 04:49:54 +0000
commitc2d475ce063857592d80ce94b56710a66ffacbaa (patch)
treed7d441c60126be8cbbb238b300b614335f7041aa /chrome
parent22180a2e7cba3485bac2a627bce01b48f4d80d7b (diff)
downloadchromium_src-c2d475ce063857592d80ce94b56710a66ffacbaa.zip
chromium_src-c2d475ce063857592d80ce94b56710a66ffacbaa.tar.gz
chromium_src-c2d475ce063857592d80ce94b56710a66ffacbaa.tar.bz2
Automatically recovers an IME connection.
Depends on: http://codereview.chromium.org/668142 BUG=crosbug.com/1768 TEST=see the bug Review URL: http://codereview.chromium.org/668144 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/cros/language_library.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/cros/language_library.cc b/chrome/browser/chromeos/cros/language_library.cc
index 4dabf85..9ff93b9 100644
--- a/chrome/browser/chromeos/cros/language_library.cc
+++ b/chrome/browser/chromeos/cros/language_library.cc
@@ -168,7 +168,12 @@ void LanguageLibrary::UpdatePropertyHandler(
bool LanguageLibrary::EnsureStarted() {
if (language_status_connection_) {
- return true;
+ if (chromeos::LanguageStatusConnectionIsAlive(
+ language_status_connection_)) {
+ return true;
+ }
+ DLOG(WARNING) << "IBus/XKB connection is closed. Trying to reconnect...";
+ chromeos::DisconnectLanguageStatus(language_status_connection_);
}
chromeos::LanguageStatusMonitorFunctions monitor_functions;
monitor_functions.current_language = &LanguageChangedHandler;