Index: chrome/browser/chromeos/login/existing_user_controller.cc |
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc |
index 8adef7577216ee018636a37206919badc96770d3..44911155fd67fc1146f3a1ae4cb1664897920bd7 100644 |
--- a/chrome/browser/chromeos/login/existing_user_controller.cc |
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc |
@@ -624,18 +624,9 @@ void ExistingUserController::ShowResetScreen() { |
login_display_->OnFadeOut(); |
} |
-void ExistingUserController::ShowTPMErrorAndScheduleReboot() { |
+void ExistingUserController::ShowTPMError() { |
login_display_->SetUIEnabled(false); |
login_display_->ShowErrorScreen(LoginDisplay::TPM_ERROR); |
- reboot_timer_.Start( |
- FROM_HERE, |
- base::TimeDelta::FromMilliseconds(kCriticalErrorRebootDelayMs), |
- this, |
- &ExistingUserController::OnRebootTimeElapsed); |
-} |
- |
-void ExistingUserController::OnRebootTimeElapsed() { |
- chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart(); |
} |
//////////////////////////////////////////////////////////////////////////////// |
@@ -658,7 +649,7 @@ void ExistingUserController::OnLoginFailure(const LoginFailure& failure) { |
GetSessionManagerClient())), |
base::TimeDelta::FromMilliseconds(kSafeModeRestartUiDelayMs)); |
} else if (failure.reason() == LoginFailure::TPM_ERROR) { |
- ShowTPMErrorAndScheduleReboot(); |
+ ShowTPMError(); |
} else if (!online_succeeded_for_.empty()) { |
ShowGaiaPasswordChanged(online_succeeded_for_); |
} else { |