Allow TPM firmware update option to be disabled.
The Chrome OS device reset aka powerwash screen can now be configured
via a pref to not force-enable the firmware update option and not let
the user change it.
BUG=chromium:742985, chromium:762030
TEST=Manual: inject pref and observe screen behavior.
Change-Id: I654257ebde46f7d6b2fee0d1bcf0bd5556ea8aff
Reviewed-on: https://chromium-review.googlesource.com/670731
Commit-Queue: Xiyuan Xia <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Reviewed-by: Dominic Battré <[email protected]>
Cr-Commit-Position: refs/heads/master@{#503743}diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 1d56ca9..0f30e03 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -208,6 +208,7 @@
#include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h"
#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
#include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
+#include "chrome/browser/chromeos/login/screens/reset_screen.h"
#include "chrome/browser/chromeos/login/session/user_session_manager.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
@@ -238,7 +239,6 @@
#include "chrome/browser/metrics/chromeos_metrics_provider.h"
#include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
-#include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "chromeos/audio/audio_devices_pref_handler_impl.h"
#include "chromeos/chromeos_switches.h"
@@ -411,7 +411,7 @@
chromeos::NetworkThrottlingObserver::RegisterPrefs(registry);
chromeos::Preferences::RegisterPrefs(registry);
chromeos::RegisterDisplayLocalStatePrefs(registry);
- chromeos::ResetScreenHandler::RegisterPrefs(registry);
+ chromeos::ResetScreen::RegisterPrefs(registry);
chromeos::ResourceReporter::RegisterPrefs(registry);
chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
chromeos::SigninScreenHandler::RegisterPrefs(registry);
