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 1199 matching lines @@
     aura::Window* lost_active) {
   if (gained_active)
     root_window_for_new_windows_ = gained_active->GetRootWindow();
 }
 
 void Shell::OnSessionStateChanged(session_manager::SessionState state) {
   // Initialize 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) {
     InitializeShelf();
+  }
+  // Recreates keyboard on user profile change, to refresh keyboard
+  // extensions with the new profile and the extensions call proper IME.
+  // |LOGGED_IN_NOT_ACTIVE| is needed so that the virtual keyboard works on
+  // supervised user creation. crbug.com/712873
+  // |ACTIVE| is also needed for guest user workflow.
+  if ((state == session_manager::SessionState::LOGGED_IN_NOT_ACTIVE ||
+       state == session_manager::SessionState::ACTIVE) &&
+      keyboard::IsKeyboardEnabled() &&
+      !keyboard::KeyboardController::GetInstance()) {
     if (GetAshConfig() != Config::MASH) {
       // Recreate the keyboard after initial login and after multiprofile login.
       CreateKeyboard();
     }
   }
 }
 
 void Shell::OnLoginStatusChanged(LoginStatus login_status) {
   UpdateAfterLoginStatusChange(login_status);
 }
@@ skipping 29 matching lines @@
 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