| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 176f283d7dc55148ea0475522f81686d5a5f6f64..2f95eb4461bf1f0ce9d81596c1a427bb4fabc35f 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -429,6 +429,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
| chromeos::SigninScreenHandler::RegisterPrefs(registry);
|
| chromeos::StartupUtils::RegisterPrefs(registry);
|
| chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
|
| + chromeos::system::InputDeviceSettings::RegisterPrefs(registry);
|
| chromeos::TimeZoneResolver::RegisterPrefs(registry);
|
| chromeos::UserImageManager::RegisterPrefs(registry);
|
| chromeos::UserSessionManager::RegisterPrefs(registry);
|
| @@ -707,8 +708,8 @@ void RegisterLoginProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| void MigrateObsoleteBrowserPrefs(Profile* profile, PrefService* local_state) {
|
| #if defined(OS_CHROMEOS)
|
| // Added 11/2016
|
| - local_state->ClearPref(prefs::kTouchScreenEnabled);
|
| - local_state->ClearPref(prefs::kTouchPadEnabled);
|
| + local_state->ClearPref(prefs::kTouchscreenEnabled);
|
| + local_state->ClearPref(prefs::kTouchpadEnabled);
|
| #endif // defined(OS_CHROMEOS)
|
| }
|
|
|
|
|