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

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

Issue 197313007: Add Easy Unlock options to chrome://settings behind a flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 9 months 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/common/url_constants.h » ('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 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 // the user. Used both in user preferences and local state, in the latter, it is 1294 // the user. Used both in user preferences and local state, in the latter, it is
1295 // actually a dictionary that maps profile keys to before-mentioned strings. 1295 // actually a dictionary that maps profile keys to before-mentioned strings.
1296 const char kProfileResetPromptMemento[] = "profile.reset_prompt_memento"; 1296 const char kProfileResetPromptMemento[] = "profile.reset_prompt_memento";
1297 1297
1298 // The GCM channel's enabled state. 1298 // The GCM channel's enabled state.
1299 const char kGCMChannelEnabled[] = "gcm.channel_enabled"; 1299 const char kGCMChannelEnabled[] = "gcm.channel_enabled";
1300 1300
1301 // Registered GCM application ids. 1301 // Registered GCM application ids.
1302 const char kGCMRegisteredAppIDs[] = "gcm.register_app_ids"; 1302 const char kGCMRegisteredAppIDs[] = "gcm.register_app_ids";
1303 1303
1304 // Whether Easy Unlock is enabled.
1305 extern const char kEasyUnlockEnabled[] = "easy_unlock.enabled";
1306
1307 // Whether to show the Easy Unlock first run tutorial.
1308 extern const char kEasyUnlockShowTutorial[] = "easy_unlock.show_tutorial";
1309
1310 // Preference storing Easy Unlock pairing data.
1311 extern const char kEasyUnlockPairing[] = "easy_unlock.pairing";
1312
1304 // *************** LOCAL STATE *************** 1313 // *************** LOCAL STATE ***************
1305 // These are attached to the machine/installation 1314 // These are attached to the machine/installation
1306 1315
1307 // A pref to configure networks device-wide. Its value must be a list of 1316 // A pref to configure networks device-wide. Its value must be a list of
1308 // NetworkConfigurations according to the OpenNetworkConfiguration 1317 // NetworkConfigurations according to the OpenNetworkConfiguration
1309 // specification. 1318 // specification.
1310 // Currently, this pref is only used to store the policy. The user's 1319 // Currently, this pref is only used to store the policy. The user's
1311 // configuration is still stored in Shill. 1320 // configuration is still stored in Shill.
1312 const char kDeviceOpenNetworkConfiguration[] = "device_onc"; 1321 const char kDeviceOpenNetworkConfiguration[] = "device_onc";
1313 1322
(...skipping 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after
2665 // A list of partner bookmark rename/remove mappings. 2674 // A list of partner bookmark rename/remove mappings.
2666 // Each list item is a dictionary containing a "url", a "provider_title" and 2675 // Each list item is a dictionary containing a "url", a "provider_title" and
2667 // "mapped_title" entries, detailing the bookmark target URL (if any), the title 2676 // "mapped_title" entries, detailing the bookmark target URL (if any), the title
2668 // given by the PartnerBookmarksProvider and either the user-visible renamed 2677 // given by the PartnerBookmarksProvider and either the user-visible renamed
2669 // title or an empty string if the bookmark node was removed. 2678 // title or an empty string if the bookmark node was removed.
2670 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; 2679 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
2671 #endif 2680 #endif
2672 2681
2673 // Whether DNS Quick Check is disabled in proxy resolution. 2682 // Whether DNS Quick Check is disabled in proxy resolution.
2674 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2683 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2684
2675 } // namespace prefs 2685 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698