| Index: ash/wm/session_state_controller_impl2.cc
|
| diff --git a/ash/wm/session_state_controller_impl2.cc b/ash/wm/session_state_controller_impl2.cc
|
| index 2084e00c5096c08c344581fdd07e3f5b434e413d..bb5c68eaa789d0fd7cc7b128e6ac7d3b5ff1694a 100644
|
| --- a/ash/wm/session_state_controller_impl2.cc
|
| +++ b/ash/wm/session_state_controller_impl2.cc
|
| @@ -370,6 +370,8 @@ void SessionStateControllerImpl2::OnRealShutdownTimeout() {
|
| }
|
| }
|
| #endif
|
| + Shell::GetInstance()->delegate()->RecordUserMetricsAction(
|
| + UMA_ACCEL_SHUT_DOWN_POWER_BUTTON);
|
| delegate_->RequestShutdown();
|
| }
|
|
|
| @@ -386,8 +388,13 @@ void SessionStateControllerImpl2::LockAnimationCancelled() {
|
| void SessionStateControllerImpl2::PreLockAnimationFinished(bool request_lock) {
|
| can_cancel_lock_animation_ = false;
|
|
|
| - if (request_lock)
|
| + if (request_lock) {
|
| + Shell::GetInstance()->delegate()->RecordUserMetricsAction(
|
| + shutdown_after_lock_ ?
|
| + UMA_ACCEL_LOCK_SCREEN_POWER_BUTTON :
|
| + UMA_ACCEL_LOCK_SCREEN_LOCK_BUTTON);
|
| delegate_->RequestLockScreen();
|
| + }
|
|
|
| lock_fail_timer_.Start(
|
| FROM_HERE,
|
|
|