Make the toggle touchscreen/touchpad shortcuts apply per-user

chrome/browser/prefs/browser_prefs.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 414 matching lines @@
   chromeos::DemoModeDetector::RegisterPrefs(registry);
   chromeos::NetworkThrottlingObserver::RegisterPrefs(registry);
   chromeos::Preferences::RegisterPrefs(registry);
   chromeos::RegisterDisplayLocalStatePrefs(registry);
   chromeos::ResetScreenHandler::RegisterPrefs(registry);
   chromeos::ResourceReporter::RegisterPrefs(registry);
   chromeos::ServicesCustomizationDocument::RegisterPrefs(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);
   chromeos::WallpaperManager::RegisterPrefs(registry);
   chromeos::echo_offer::RegisterPrefs(registry);
   extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);
   invalidation::InvalidatorStorage::RegisterPrefs(registry);
   ::onc::RegisterPrefs(registry);
   policy::AutoEnrollmentClient::RegisterPrefs(registry);
   policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);
@@ skipping 154 matching lines @@
   chromeos::first_run::RegisterProfilePrefs(registry);
   chromeos::file_system_provider::RegisterProfilePrefs(registry);
   chromeos::KeyPermissions::RegisterProfilePrefs(registry);
   chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
   chromeos::PinStorage::RegisterProfilePrefs(registry);
   chromeos::Preferences::RegisterProfilePrefs(registry);
   chromeos::PrinterPrefManager::RegisterProfilePrefs(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);
   ::onc::RegisterProfilePrefs(registry);
 #endif
 
 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_APP_LIST)
   ArcAppListPrefs::RegisterProfilePrefs(registry);
 #endif
 
@@ skipping 79 matching lines @@
 #if defined(OS_CHROMEOS)
 void RegisterLoginProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   RegisterProfilePrefs(registry);
 
   chromeos::PowerPrefs::RegisterLoginProfilePrefs(registry);
 }
 #endif
 
 // 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 local state registry, but I
moved the registration to the profile registry.

This is causing multiple DCHECKS.

[gab, 2016/11/09 16:30:16]

Right, look at the paradigm for say kShownAutoLaunchInfobarDeprecated below. You
need to suppress the definition of the variable in pref_names.h, move it here in
anonymous namespace. Then still register above and clear it here.

At the same time, our practice is to have people that add such cleanup to also
remove 1+ year old cleanups (i.e. kShownAutoLaunchInfobarDeprecated
specifically) so we naturally cycle cleanups, mind doing that? Thanks

[gab, 2016/11/09 16:31:55]

I'm sorry, in your case you don't want to suppress it from pref_names.h but
you'll still want to move it to the Local State section of the files:
https://cs.chromium.org/chromium/src/chrome/common/pref_names.cc?dr&q=%22****...

(I know it's a bit of a mess...)

[gab, 2016/11/09 16:33:31]

Err.. you want to move it to the PROFILE PREFS section:
https://cs.chromium.org/chromium/src/chrome/common/pref_names.cc?dr&q=%22****...

Interestingly, it already appears to be there. So I guess it was poorly placed
before and is now made correct..!

[afakhry, 2016/11/09 17:21:46]

Done. Thanks for the clarification!
kShownAutoLaunchInfobarDeprecated is removed, and the prefs are registered in
both local state and profile until migration is complete.

+#endif  // defined(OS_CHROMEOS)
 }
 
 // This method should be periodically pruned of year+ old migrations.
 void MigrateObsoleteProfilePrefs(Profile* profile) {
   PrefService* profile_prefs = profile->GetPrefs();
 
 #if defined(OS_WIN)
   // Added 11/2015.
   profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated);
 #endif
@@ skipping 65 matching lines @@
   // Added 8/2016.
   profile_prefs->ClearPref(kStaticEncodings);
   profile_prefs->ClearPref(kRecentlySelectedEncoding);
 
   // Added 9/2016.
   profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
   profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
 }
 
 }  // namespace chrome