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

Side by Side Diff: chrome/common/pref_names.cc

Issue 696583002: [Smart Lock] Add a setting to require close proximity in order for unlocking to work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more indentation Created 6 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 unified diff | Download patch
« no previous file with comments | « chrome/common/pref_names.h ('k') | components/proximity_auth.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 1189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 // a preference was reset. 1200 // a preference was reset.
1201 const char kPreferenceResetTime[] = "prefs.preference_reset_time"; 1201 const char kPreferenceResetTime[] = "prefs.preference_reset_time";
1202 1202
1203 // The GCM channel's enabled state. 1203 // The GCM channel's enabled state.
1204 const char kGCMChannelEnabled[] = "gcm.channel_enabled"; 1204 const char kGCMChannelEnabled[] = "gcm.channel_enabled";
1205 1205
1206 // How many Service Workers are registered with the Push API (could be zero). 1206 // How many Service Workers are registered with the Push API (could be zero).
1207 const char kPushMessagingRegistrationCount[] = 1207 const char kPushMessagingRegistrationCount[] =
1208 "gcm.push_messaging_registration_count"; 1208 "gcm.push_messaging_registration_count";
1209 1209
1210 // Whether a user is allowed to use Easy Unlock.
1211 const char kEasyUnlockAllowed[] = "easy_unlock.allowed";
1212
1210 // Whether Easy Unlock is enabled. 1213 // Whether Easy Unlock is enabled.
1211 const char kEasyUnlockEnabled[] = "easy_unlock.enabled"; 1214 const char kEasyUnlockEnabled[] = "easy_unlock.enabled";
1212 1215
1216 // Preference storing Easy Unlock pairing data.
1217 const char kEasyUnlockPairing[] = "easy_unlock.pairing";
1218
1219 // Whether close proximity between the remote and the local device is required
1220 // in order to use Easy Unlock.
1221 const char kEasyUnlockProximityRequired[] = "easy_unlock.proximity_required";
1222
1213 // Whether to show the Easy Unlock first run tutorial. 1223 // Whether to show the Easy Unlock first run tutorial.
1214 const char kEasyUnlockShowTutorial[] = "easy_unlock.show_tutorial"; 1224 const char kEasyUnlockShowTutorial[] = "easy_unlock.show_tutorial";
1215 1225
1216 // Preference storing Easy Unlock pairing data.
1217 const char kEasyUnlockPairing[] = "easy_unlock.pairing";
1218
1219 // Whether a user is allowed to use Easy Unlock.
1220 const char kEasyUnlockAllowed[] = "easy_unlock.allowed";
1221
1222 // A cache of zero suggest results using JSON serialized into a string. 1226 // A cache of zero suggest results using JSON serialized into a string.
1223 const char kZeroSuggestCachedResults[] = "zerosuggest.cachedresults"; 1227 const char kZeroSuggestCachedResults[] = "zerosuggest.cachedresults";
1224 1228
1225 // *************** LOCAL STATE *************** 1229 // *************** LOCAL STATE ***************
1226 // These are attached to the machine/installation 1230 // These are attached to the machine/installation
1227 1231
1228 // A pref to configure networks device-wide. Its value must be a list of 1232 // A pref to configure networks device-wide. Its value must be a list of
1229 // NetworkConfigurations according to the OpenNetworkConfiguration 1233 // NetworkConfigurations according to the OpenNetworkConfiguration
1230 // specification. 1234 // specification.
1231 // Currently, this pref is only used to store the policy. The user's 1235 // Currently, this pref is only used to store the policy. The user's
(...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
2269 // Whether Guest Mode is enabled within the browser. 2273 // Whether Guest Mode is enabled within the browser.
2270 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled"; 2274 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled";
2271 2275
2272 // Whether Adding a new Person is enabled within the user manager. 2276 // Whether Adding a new Person is enabled within the user manager.
2273 const char kBrowserAddPersonEnabled[] = "profile.add_person_enabled"; 2277 const char kBrowserAddPersonEnabled[] = "profile.add_person_enabled";
2274 2278
2275 // A dictionary that maps user id to hardlock state. 2279 // A dictionary that maps user id to hardlock state.
2276 const char kEasyUnlockHardlockState[] = "easy_unlock.hardlock_state"; 2280 const char kEasyUnlockHardlockState[] = "easy_unlock.hardlock_state";
2277 2281
2278 } // namespace prefs 2282 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | components/proximity_auth.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698