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

Unified Diff: ash/mus/bridge/wm_shell_mus.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/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index d9e9bd2b9f0e427b0be43de396fede0f96d1a467..d5edcc16ea928dbe91e396c54aa802b07923d54c 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -392,6 +392,11 @@ void WmShellMus::OnOverviewModeEnded() {
observer.OnOverviewModeEnded();
}
+void WmShellMus::OnUserSessionStateActive() {
+ CreateShelf();
+ // Mash has a different codepath for virtual keyboard initialization.
msw 2016/12/16 16:26:20 This comment is a bit odd, since nothing keyboard
James Cook 2016/12/20 04:02:43 This codepath doesn't exist anymore.
+}
+
SessionStateDelegate* WmShellMus::GetSessionStateDelegate() {
return session_state_delegate_.get();
}

Powered by Google App Engine
This is Rietveld 408576698