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 cfc4c16eef11bb9e16dc7cf060ced66947d1f33d..f77723bb6d2a63c5a403a7461ba72e1d268093cb 100644 |
--- a/chrome/browser/chromeos/login/wizard_controller.cc |
+++ b/chrome/browser/chromeos/login/wizard_controller.cc |
@@ -39,6 +39,7 @@ |
#include "chrome/browser/chromeos/login/user_manager.h" |
#include "chrome/browser/chromeos/settings/cros_settings.h" |
#include "chrome/browser/chromeos/settings/cros_settings_names.h" |
+#include "chrome/browser/prefs/pref_registry_simple.h" |
#include "chrome/browser/prefs/pref_service.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/ui/options/options_util.h" |
@@ -385,22 +386,14 @@ void WizardController::SkipUpdateEnrollAfterEula() { |
} |
// static |
-void WizardController::RegisterPrefs(PrefServiceSimple* local_state) { |
+void WizardController::RegisterPrefs(PrefRegistrySimple* 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); |