Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(559)

Unified Diff: chrome/browser/chromeos/login/lock/screen_locker.cc

Issue 646743002: This CL fixes order of Input Methods initialization on ChromeOS lock streen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/lock/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc
index 5434bf0e22d6b239282df2ed748ca466b540e736..df47ad9a90d9b287e5b5205c206a915165f9e7d9 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/screen_locker.cc
@@ -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));
@@ -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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698