Commit 61e62823 authored by alemate's avatar alemate Committed by Commit bot

This CL fixes order of Input Methods initialization on ChromeOS lock streen.

On lock screen focusPOD evend happened before user input mathods were saved,
thus changing user input method to login. This CL fixes initialization order.

BUG=418878

Review URL: https://codereview.chromium.org/646743002

Cr-Commit-Position: refs/heads/master@{#299141}
parent 50c6251d
...@@ -159,6 +159,11 @@ ScreenLocker::ScreenLocker(const user_manager::UserList& users) ...@@ -159,6 +159,11 @@ ScreenLocker::ScreenLocker(const user_manager::UserList& users)
} }
void ScreenLocker::Init() { void ScreenLocker::Init() {
input_method::InputMethodManager* imm =
input_method::InputMethodManager::Get();
saved_ime_state_ = imm->GetActiveIMEState();
imm->SetState(saved_ime_state_->Clone());
authenticator_ = LoginUtils::Get()->CreateAuthenticator(this); authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
extended_authenticator_ = new ExtendedAuthenticator(this); extended_authenticator_ = new ExtendedAuthenticator(this);
delegate_.reset(new WebUIScreenLocker(this)); delegate_.reset(new WebUIScreenLocker(this));
...@@ -497,11 +502,9 @@ void ScreenLocker::ScreenLockReady() { ...@@ -497,11 +502,9 @@ void ScreenLocker::ScreenLockReady() {
ash::Shell::GetInstance()-> ash::Shell::GetInstance()->
desktop_background_controller()->MoveDesktopToLockedContainer(); desktop_background_controller()->MoveDesktopToLockedContainer();
input_method::InputMethodManager* imm = input_method::InputMethodManager::Get()
input_method::InputMethodManager::Get(); ->GetActiveIMEState()
saved_ime_state_ = imm->GetActiveIMEState(); ->EnableLockScreenLayouts();
imm->SetState(saved_ime_state_->Clone());
imm->GetActiveIMEState()->EnableLockScreenLayouts();
bool state = true; bool state = true;
VLOG(1) << "Emitting SCREEN_LOCK_STATE_CHANGED with state=" << state; VLOG(1) << "Emitting SCREEN_LOCK_STATE_CHANGED with state=" << state;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment