Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Merge 299141 "This CL fixes order of Input Methods initialization on …
Browse files Browse the repository at this point in the history
…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
TBR=alemate

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

Cr-Commit-Position: refs/heads/master@{#299141}
(cherry picked from commit 61e6282)

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

Cr-Commit-Position: refs/branch-heads/2171@{#169}
Cr-Branched-From: 267aeeb-refs/heads/master@{#297060}
  • Loading branch information
Nikita Kostylev committed Oct 17, 2014
1 parent ff214bb commit 884f6a9
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions chrome/browser/chromeos/login/lock/screen_locker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@ ScreenLocker::ScreenLocker(const user_manager::UserList& users)
}

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);
extended_authenticator_ = new ExtendedAuthenticator(this);
delegate_.reset(new WebUIScreenLocker(this));
Expand Down Expand Up @@ -497,11 +502,9 @@ void ScreenLocker::ScreenLockReady() {
ash::Shell::GetInstance()->
desktop_background_controller()->MoveDesktopToLockedContainer();

input_method::InputMethodManager* imm =
input_method::InputMethodManager::Get();
saved_ime_state_ = imm->GetActiveIMEState();
imm->SetState(saved_ime_state_->Clone());
imm->GetActiveIMEState()->EnableLockScreenLayouts();
input_method::InputMethodManager::Get()
->GetActiveIMEState()
->EnableLockScreenLayouts();

bool state = true;
VLOG(1) << "Emitting SCREEN_LOCK_STATE_CHANGED with state=" << state;
Expand Down

0 comments on commit 884f6a9

Please sign in to comment.