Make virtual keyboard work on supervised user creation

ash/shell.cc

 // Copyright (c) 2012 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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 1197 matching lines @@
   WmWindow* gained_active_wm = WmWindow::Get(gained_active);
   if (gained_active_wm)
     root_window_for_new_windows_ = gained_active_wm->GetRootWindow();
 }
 
 void Shell::OnSessionStateChanged(session_manager::SessionState state) {
   // Create the shelf when a session becomes active. It's safe to do this
   // multiple times (e.g. initial login vs. multiprofile add session).
   if (state == session_manager::SessionState::ACTIVE) {
     CreateShelfView();
+  }
 
+  // The keyboard is recreated on user profile change, so to refresh keyboard
+  // extensions with the new profile and proper IME engine is called from them.
+  // |LOGGED_IN_NOT_ACTIVE| is needed so that the virtual keyboard works on
+  // supervised user creation. crbug.com/712873
+  // The previous state is checked to avoid needless |CreateKeyboard| call.
+  if ((state == session_manager::SessionState::LOGGED_IN_NOT_ACTIVE ||
+       state == session_manager::SessionState::ACTIVE) &&
+      !(previous_state_ ==
+            session_manager::SessionState::LOGGED_IN_NOT_ACTIVE ||
+        previous_state_ == session_manager::SessionState::ACTIVE)) {

[xiyuan, 2017/05/12 17:30:03]

How about using KeyboardController::GetInstance() to suppress duplicate calls
instead of using a |previous_state_|?

e.g.

  if ((state == SessionState::LOGGED_IN_NOT_ACTIVE ||
       state == SessionState::ACTIVE) &&
       keyboard::IsKeyboardEnabled()) &&
       !KeyboardController::GetInstance()) {
  }

[oka, 2017/06/07 12:42:37]

Updated.

     if (GetAshConfig() != Config::MASH) {

[Alexander Alekseev, 2017/05/12 04:05:21]

Did you verify that multiprofile mode works with this change?

[oka, 2017/06/07 12:42:37]

I manually confirmed keyboard works after multiprofile switch.

-      // Recreate the keyboard after initial login and after multiprofile login.
       CreateKeyboard();
     }
   }
+  previous_state_ = state;
 }
 
 void Shell::OnLoginStatusChanged(LoginStatus login_status) {
   UpdateAfterLoginStatusChange(login_status);
 }
 
 void Shell::OnLockStateChanged(bool locked) {
 #ifndef NDEBUG
   // Make sure that there is no system modal in Lock layer when unlocked.
   if (!locked) {
     aura::Window::Windows containers = wm::GetContainersFromAllRootWindows(
         kShellWindowId_LockSystemModalContainer, GetPrimaryRootWindow());
     for (aura::Window* container : containers)
       DCHECK(container->children().empty());
   }
 #endif
 }
 
 void Shell::OnPrefServiceInitialized(
     std::unique_ptr<::PrefService> pref_service) {
   if (!instance_)
     return;
   // |pref_service_| is null if can't connect to Chrome (as happens when
   // running mash outside of chrome --mash and chrome isn't built).
   pref_service_ = std::move(pref_service);
 }
 
 }  // namespace ash