summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 16:12:44 +0000
committeralemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 16:14:16 +0000
commit766f89290329c3c74a1cc717dbc391c27c94ea91 (patch)
tree9a522c000567d442ee481079d54ba40a3b400c50
parentd81c3e78067a58dcdeda25cb2982c6886643b660 (diff)
downloadchromium_src-766f89290329c3c74a1cc717dbc391c27c94ea91.zip
chromium_src-766f89290329c3c74a1cc717dbc391c27c94ea91.tar.gz
chromium_src-766f89290329c3c74a1cc717dbc391c27c94ea91.tar.bz2
ChromeOS: language indicator in the system tray doesn't come up after unlock.
This CL forces update of system tray state on new IME State even if current input method has not changed. BUG=406186 TEST=manual Review URL: https://codereview.chromium.org/496993003 Cr-Commit-Position: refs/heads/master@{#291422} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291422 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/input_method/input_method_manager_impl.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
index 6679b58..911f8fd 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -754,10 +754,16 @@ void InputMethodManagerImpl::SetState(
// indicator is used by only keyboard layout input methods.
MaybeInitializeCandidateWindowController();
- if (need_update_current_input_method)
+ if (need_update_current_input_method) {
ChangeInputMethodInternal(state_->current_input_method,
false /* show_message */,
true /* notify_menu */);
+ } else {
+ // Update input method indicators (e.g. "US", "DV") in Chrome windows.
+ FOR_EACH_OBSERVER(InputMethodManager::Observer,
+ observers_,
+ InputMethodChanged(this, false /* show_message */));
+ }
}
}