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

Unified Diff: ash/shell.h

Issue 2797743002: ash: Merge LoginStatus update code path (Closed)
Patch Set: fix post unlock animation not run, and tests Created 3 years, 8 months 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/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index d421ddc846c8936bf73155280c3145ec4fa8e260..3f820c244aed39816d53c609e86cfc7e1a6b2b30 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -272,10 +272,6 @@ class ASH_EXPORT Shell : public SessionStateObserver,
void SetDisplayWorkAreaInsets(aura::Window* window,
const gfx::Insets& insets);
- // Called when the user logs in.
- // TODO(jamescook): Merge this with WmShell::UpdateAfterLoginStatusChange()?
- void OnLoginStateChanged(LoginStatus status);
-
// Called when the application is exiting.
void OnAppTerminating();
@@ -644,6 +640,7 @@ class ASH_EXPORT Shell : public SessionStateObserver,
// SessionStateObserver:
void SessionStateChanged(session_manager::SessionState state) override;
+ void LoginStatusChanged(LoginStatus login_status) override;
// Callback for prefs::ConnectToPrefService.
void OnPrefServiceInitialized(std::unique_ptr<::PrefService> pref_service);

Powered by Google App Engine
This is Rietveld 408576698