Make SetState be called later when screen is unlocking.

chrome/browser/chromeos/login/lock/screen_locker.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 187 matching lines @@
       LOG(ERROR) << "Start time is not set at authentication success";
   } else {
     base::TimeDelta delta = base::Time::Now() - authentication_start_time_;
     VLOG(1) << "Authentication success: " << delta.InSecondsF() << " second(s)";
     UMA_HISTOGRAM_TIMES("ScreenLocker.AuthenticationSuccessTime", delta);
   }
 
   const user_manager::User* user =
       user_manager::UserManager::Get()->FindUser(user_context.GetUserID());
   if (user) {
-    if (user->is_active()) {
-      DCHECK(saved_ime_state_);
-      input_method::InputMethodManager::Get()->SetState(saved_ime_state_);
-    } else {
+    if (!user->is_active()) {
       user_manager::UserManager::Get()->SwitchActiveUser(
           user_context.GetUserID());
     }
   } else {
     NOTREACHED() << "Logged in user not found.";
   }
-  saved_ime_state_ = NULL;
 
   authentication_capture_.reset(new AuthenticationParametersCapture());
   authentication_capture_->user_context = user_context;
 
   // Add guard for case when something get broken in call chain to unlock
   // for sure.
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ScreenLocker::UnlockOnLoginSuccess,
           weak_factory_.GetWeakPtr()),
@@ skipping 227 matching lines @@
   bool state = false;
   VLOG(1) << "Emitting SCREEN_LOCK_STATE_CHANGED with state=" << state;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
 
   VLOG(1) << "Calling session manager's HandleLockScreenDismissed D-Bus method";
   DBusThreadManager::Get()->GetSessionManagerClient()->
       NotifyLockScreenDismissed();
+
+  if (saved_ime_state_) {
+    input_method::InputMethodManager::Get()->SetState(saved_ime_state_);
+  }
 }
 
 void ScreenLocker::SetAuthenticator(Authenticator* authenticator) {
   authenticator_ = authenticator;
 }
 
 void ScreenLocker::ScreenLockReady() {
   locked_ = true;
   base::TimeDelta delta = base::Time::Now() - start_time_;
   VLOG(1) << "ScreenLocker " << this << " is ready after "
           << delta.InSecondsF() << " second(s)";
   UMA_HISTOGRAM_TIMES("ScreenLocker.ScreenLockTime", delta);
 
   VLOG(1) << "Moving desktop background to locked container";
   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());
+  saved_ime_state_ = imm->GetActiveIMEState()->Clone();
   imm->GetActiveIMEState()->EnableLockScreenLayouts();

[Alexander Alekseev, 2014/09/01 12:24:43]

Why do you need this change?
This breaks "User default" IME state, which is stored in UserManager.

The idea was: if we need to temporary filter active layouts, then we
create temporary state, make it active, and modify it. This way the
previous state will be unchanged.

[Shu Chen, 2014/09/01 13:37:53]

I've reverted the change here. My original intention was to reduce the
InputMethodChange notification, as SetState() will call
ChangeInputMethodInternal().

[Alexander Alekseev, 2014/09/01 13:50:05]

SetState will not call ChangeInputMethodInternal() if curernt input method has
not changed. But it will notify InputMethodChanged() ... The latter is my
temporary solution to notify status tray that "number of active input methods
has changed". So we probably need to add another notification there and make
SetState() never notify if it has not changed.

 
   bool state = true;
   VLOG(1) << "Emitting SCREEN_LOCK_STATE_CHANGED with state=" << state;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
   VLOG(1) << "Calling session manager's HandleLockScreenShown D-Bus method";
   DBusThreadManager::Get()->GetSessionManagerClient()->NotifyLockScreenShown();
 }
 
 content::WebUI* ScreenLocker::GetAssociatedWebUI() {
   return delegate_->GetAssociatedWebUI();
 }
 
 bool ScreenLocker::IsUserLoggedIn(const std::string& username) {
   for (user_manager::UserList::const_iterator it = users_.begin();
        it != users_.end();
        ++it) {
     if ((*it)->email() == username)
       return true;
   }
   return false;
 }
 
 }  // namespace chromeos