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

Unified Diff: ash/aura/wm_shell_aura.cc

Issue 2573703003: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: rebase on session change, fix tests 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
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..e56e930174666c390bcb6f97cd90c98954f36833 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -246,6 +246,11 @@ void WmShellAura::OnOverviewModeEnded() {
observer.OnOverviewModeEnded();
}
+void WmShellAura::OnUserSessionStateActive() {
+ CreateShelf();
msw 2016/12/16 16:26:20 It's a bit odd that we'll potentially call CreateS
James Cook 2016/12/20 04:02:42 OK, fixed that. (I could also just rename this fu
+ Shell::GetInstance()->CreateKeyboard();
msw 2016/12/16 16:26:20 Is this necessary here? Shouldn't it be triggered
James Cook 2016/12/20 04:02:42 The virtual keyboard can be shown at the login scr
+}
+
SessionStateDelegate* WmShellAura::GetSessionStateDelegate() {
return Shell::GetInstance()->session_state_delegate();
}

Powered by Google App Engine
This is Rietveld 408576698