summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorrickcam@chromium.org <rickcam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-19 00:46:34 +0000
committerrickcam@chromium.org <rickcam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-19 00:46:34 +0000
commit5d3b29bf92fd075a51106e6b2da7a574ecae2f45 (patch)
tree59224661634e1978f7c1297bee42d293f3e764bc /chrome
parent6091604d9afaa69457389d83f1a9d6453150e6f4 (diff)
downloadchromium_src-5d3b29bf92fd075a51106e6b2da7a574ecae2f45.zip
chromium_src-5d3b29bf92fd075a51106e6b2da7a574ecae2f45.tar.gz
chromium_src-5d3b29bf92fd075a51106e6b2da7a574ecae2f45.tar.bz2
Added two ChromeOS-specific values to kSynchronizedPreferences.
BUG=70696 TEST=In side-by-side ChromeOS instances, change prefs in one, then watch them propagate to the other. Repeat in both directions. Review URL: http://codereview.chromium.org/6665036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/sync/glue/synchronized_preferences.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/sync/glue/synchronized_preferences.h b/chrome/browser/sync/glue/synchronized_preferences.h
index 25135fa..091b330 100644
--- a/chrome/browser/sync/glue/synchronized_preferences.h
+++ b/chrome/browser/sync/glue/synchronized_preferences.h
@@ -186,6 +186,14 @@ static const char* kSynchronizedPreferences[] = {
// Whether to show mobile plan notifications.
// Settings -> Internet -> Mobile plan details
prefs::kShowPlanNotifications,
+
+ // Whether to require password to wake up from sleep
+ // Settings -> Personal Stuff -> Account
+ prefs::kEnableScreenLock,
+
+ // Whether to enable tap-to-click
+ // Settings -> System -> Touchpad
+ prefs::kTapToClickEnabled,
#endif
};