summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 01:16:19 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 01:16:19 +0000
commitd415b730fad0c9293970768a1b4aafc3121d97e6 (patch)
tree6e3bbee5694fcfe1d80172baa8f2b1fc3cc86082 /chrome/browser
parent3a2e7c7b5a3cfabaab0043020f2a35cde53fb0d7 (diff)
downloadchromium_src-d415b730fad0c9293970768a1b4aafc3121d97e6.zip
chromium_src-d415b730fad0c9293970768a1b4aafc3121d97e6.tar.gz
chromium_src-d415b730fad0c9293970768a1b4aafc3121d97e6.tar.bz2
Explicitly set the input method on IME connected, even if it's the hardware layout.
BUG=none TEST=Add the Dutch input method. Set the input method to US Querty. Log out. Log in. Ensure the starting input method is US Querty. Review URL: http://codereview.chromium.org/3080027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chromeos/cros/input_method_library.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/cros/input_method_library.cc b/chrome/browser/chromeos/cros/input_method_library.cc
index 4e17374..b78f133 100644
--- a/chrome/browser/chromeos/cros/input_method_library.cc
+++ b/chrome/browser/chromeos/cros/input_method_library.cc
@@ -299,12 +299,7 @@ class InputMethodLibraryImpl : public InputMethodLibrary {
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.
@@ -601,4 +596,3 @@ InputMethodLibrary* InputMethodLibrary::GetImpl(bool stub) {
// 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);
-