Re-reland: chromeos: Fix shelf appearing at login screen under mash

ash/aura/wm_shell_aura.cc

 // Copyright 2016 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/aura/wm_shell_aura.h"
 
 #include <utility>
 
 #include "ash/aura/key_event_watcher_aura.h"
 #include "ash/aura/pointer_watcher_adapter.h"
@@ skipping 300 matching lines @@
 }
 
 void WmShellAura::OnAttemptToReactivateWindow(aura::Window* request_active,
                                               aura::Window* actual_active) {
   for (auto& observer : activation_observers_) {
     observer.OnAttemptToReactivateWindow(WmWindowAura::Get(request_active),
                                          WmWindowAura::Get(actual_active));
   }
 }
 
+void WmShellAura::SessionStateChanged(session_manager::SessionState state) {
+  // Create the shelf if necessary.
+  WmShell::SessionStateChanged(state);
+
+  // Recreate the keyboard after initial login and after multiprofile login.
+  if (state == session_manager::SessionState::ACTIVE)
+    Shell::GetInstance()->CreateKeyboard();
+}
+
 void WmShellAura::OnDisplayConfigurationChanging() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanging();
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace ash