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

Unified Diff: ash/shell.h

Issue 2801333002: mash: Run pre-unlock animation via SessionController (Closed)
Patch Set: fix compile 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 b185c031bd5a094f5954cdc54d4f6133d237a41e..8cc27872f003006a345ab34226ea8e2061b36f27 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -272,10 +272,6 @@ class ASH_EXPORT Shell : public SessionStateObserver,
// Called when the application is exiting.
void OnAppTerminating();
- // Called when the screen is locked (after the lock window is visible) or
- // unlocked.
- void OnLockStateChanged(bool locked);
-
// Called when a casting session is started or stopped.
void OnCastingSessionStartedOrStopped(bool started);
@@ -638,6 +634,7 @@ class ASH_EXPORT Shell : public SessionStateObserver,
// SessionStateObserver:
void SessionStateChanged(session_manager::SessionState state) override;
void LoginStatusChanged(LoginStatus login_status) override;
+ void OnLockStateChanged(bool locked) override;
// Callback for prefs::ConnectToPrefService.
void OnPrefServiceInitialized(std::unique_ptr<::PrefService> pref_service);

Powered by Google App Engine
This is Rietveld 408576698