Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2851)

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2467023004: Make the toggle touchscreen/touchpad shortcuts apply per-user (Closed)
Patch Set: gab's comment Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/system/input_device_settings.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 797e3e62b365f45819382df0a9027318f7b16ce6..34c1a3b6806620f9ccc5efb7cfcda98a051e53f9 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -432,7 +432,6 @@ 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);
@@ -607,6 +606,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
chromeos::RegisterQuickUnlockProfilePrefs(registry);
chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
+ chromeos::system::InputDeviceSettings::RegisterProfilePrefs(registry);
chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
extensions::EPKPChallengeUserKey::RegisterProfilePrefs(registry);
flags_ui::PrefServiceFlagsStorage::RegisterProfilePrefs(registry);
@@ -706,6 +706,11 @@ void RegisterLoginProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// This method should be periodically pruned of year+ old migrations.
void MigrateObsoleteBrowserPrefs(Profile* profile, PrefService* local_state) {
+#if defined(OS_CHROMEOS)
+ // Added 11/2016
+ local_state->ClearPref(prefs::kTouchScreenEnabled);
+ local_state->ClearPref(prefs::kTouchPadEnabled);
afakhry 2016/11/08 22:36:16 Apparently the prefs have to be registered in the
gab 2016/11/09 16:30:16 Right, look at the paradigm for say kShownAutoLaun
gab 2016/11/09 16:31:55 I'm sorry, in your case you don't want to suppress
gab 2016/11/09 16:33:31 Err.. you want to move it to the PROFILE PREFS sec
afakhry 2016/11/09 17:21:46 Done. Thanks for the clarification! kShownAutoLaun
+#endif // defined(OS_CHROMEOS)
}
// This method should be periodically pruned of year+ old migrations.
« no previous file with comments | « chrome/browser/chromeos/system/input_device_settings.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698