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

Unified Diff: ash/session/session_controller.cc

Issue 2830933002: cros: Use SessionController for lock starting code (Closed)
Patch Set: update comment 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/session/session_controller.cc
diff --git a/ash/session/session_controller.cc b/ash/session/session_controller.cc
index b546c92beb460d343e225adc25238ff112ea1449..ab638809c52164a78b6f2a72aa87a46c4ca7ec85 100644
--- a/ash/session/session_controller.cc
+++ b/ash/session/session_controller.cc
@@ -210,13 +210,20 @@ void SessionController::SetUserSessionOrder(
}
}
+void SessionController::RunLockAnimation(
+ const RunLockAnimationCallback& callback) {
+ LockStateController* const lock_state_controller =
+ Shell::Get()->lock_state_controller();
+
+ lock_state_controller->SetLockScreenDisplayedCallback(callback);
+ lock_state_controller->OnStartingLock();
+}
+
void SessionController::RunUnlockAnimation(
const RunUnlockAnimationCallback& callback) {
is_unlocking_ = true;
- // Shell could have no instance in tests.
James Cook 2017/04/19 23:13:12 Thanks for cleaning this up.
xiyuan 2017/04/20 18:23:59 I have to put it back. SessionControllerTest deriv
- if (Shell::HasInstance())
- Shell::Get()->lock_state_controller()->OnLockScreenHide(callback);
+ Shell::Get()->lock_state_controller()->OnLockScreenHide(callback);
}
void SessionController::NotifyChromeTerminating() {

Powered by Google App Engine
This is Rietveld 408576698