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

Unified Diff: ash/aura/wm_shell_aura.cc

Issue 2573703003: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: msw comments Created 4 years 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 | « ash/aura/wm_shell_aura.h ('k') | ash/common/shelf/shelf_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index 2d59990720296339935609efaafa94c635b8b13c..5f71ec40714db5e37d3edf5ef8e8d6ee61412f13 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -323,6 +323,15 @@ void WmShellAura::OnAttemptToReactivateWindow(aura::Window* request_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();
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/shelf/shelf_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698