| Index: chrome/browser/chromeos/login/wizard_controller.cc
|
| diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
|
| index a14b2620daf486759934e0e473e2e12ebee6713b..b683c7169a62c46a8e169f25902514253eead5f8 100644
|
| --- a/chrome/browser/chromeos/login/wizard_controller.cc
|
| +++ b/chrome/browser/chromeos/login/wizard_controller.cc
|
| @@ -385,22 +385,14 @@ void WizardController::SkipUpdateEnrollAfterEula() {
|
| }
|
|
|
| // static
|
| -void WizardController::RegisterPrefs(PrefServiceSimple* local_state) {
|
| +void WizardController::RegisterPrefs(PrefRegistrarSimple* local_state) {
|
| local_state->RegisterBooleanPref(kOobeComplete, false);
|
| local_state->RegisterIntegerPref(kDeviceRegistered, -1);
|
| local_state->RegisterBooleanPref(kEulaAccepted, false);
|
| local_state->RegisterStringPref(kInitialLocale, "en-US");
|
| - // Check if the pref is already registered in case
|
| - // Preferences::RegisterUserPrefs runs before this code in the future.
|
| - if (local_state->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) {
|
| - local_state->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, false);
|
| - }
|
| - if (local_state->FindPreference(prefs::kHighContrastEnabled) == NULL) {
|
| - local_state->RegisterBooleanPref(prefs::kHighContrastEnabled, false);
|
| - }
|
| - if (local_state->FindPreference(prefs::kVirtualKeyboardEnabled) == NULL) {
|
| - local_state->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled, false);
|
| - }
|
| + local_state->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, false);
|
| + local_state->RegisterBooleanPref(prefs::kHighContrastEnabled, false);
|
| + local_state->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled, false);
|
| local_state->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false);
|
| local_state->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true);
|
| local_state->RegisterBooleanPref(prefs::kFactoryResetRequested, false);
|
|
|