diff --git a/ash/shell.cc b/ash/shell.cc index 0009b1877eaa20..84ed5d45614699 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -395,7 +395,7 @@ void Shell::RegisterProfilePrefs(PrefRegistrySimple* registry, bool for_test) { PaletteTray::RegisterProfilePrefs(registry); PaletteWelcomeBubble::RegisterProfilePrefs(registry); ShelfController::RegisterProfilePrefs(registry); - TouchDevicesController::RegisterProfilePrefs(registry, for_test); + TouchDevicesController::RegisterProfilePrefs(registry); CapsLockNotificationController::RegisterProfilePrefs(registry, for_test); } diff --git a/ash/touch/touch_devices_controller.cc b/ash/touch/touch_devices_controller.cc index 36c2a750f681e1..8ad098dfb2537a 100644 --- a/ash/touch/touch_devices_controller.cc +++ b/ash/touch/touch_devices_controller.cc @@ -52,20 +52,12 @@ PrefService* GetActivePrefService() { } // namespace // static -void TouchDevicesController::RegisterProfilePrefs(PrefRegistrySimple* registry, - bool for_test) { - if (for_test) { - // In tests there is no remote pref service. Make ash own the prefs. - registry->RegisterBooleanPref( - prefs::kTapDraggingEnabled, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF | - PrefRegistry::PUBLIC); - } else { - // In production the prefs are owned by chrome. - // TODO: Move ownership to ash. - registry->RegisterForeignPref(prefs::kTapDraggingEnabled); - } - +void TouchDevicesController::RegisterProfilePrefs( + PrefRegistrySimple* registry) { + registry->RegisterBooleanPref( + prefs::kTapDraggingEnabled, false, + user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF | + PrefRegistry::PUBLIC); registry->RegisterBooleanPref(prefs::kTouchpadEnabled, PrefRegistry::PUBLIC); registry->RegisterBooleanPref(prefs::kTouchscreenEnabled, PrefRegistry::PUBLIC); diff --git a/ash/touch/touch_devices_controller.h b/ash/touch/touch_devices_controller.h index 131dc5376db652..0bbe4590b3487e 100644 --- a/ash/touch/touch_devices_controller.h +++ b/ash/touch/touch_devices_controller.h @@ -33,7 +33,7 @@ class ASH_EXPORT TouchDevicesController : public SessionObserver { TouchDevicesController(); ~TouchDevicesController() override; - static void RegisterProfilePrefs(PrefRegistrySimple* registry, bool for_test); + static void RegisterProfilePrefs(PrefRegistrySimple* registry); // Toggles the status of touchpad between enabled and disabled. void ToggleTouchpad(); diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 0e0a4f9266774e..1a4ee880b09080 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -239,10 +239,6 @@ void Preferences::RegisterProfilePrefs( registry->RegisterBooleanPref( ash::prefs::kShouldAlwaysShowAccessibilityMenu, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterBooleanPref( - ash::prefs::kTapDraggingEnabled, false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF | - PrefRegistry::PUBLIC); registry->RegisterIntegerPref( prefs::kMouseSensitivity,