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

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

Issue 10540149: [Sync] Persist keystore key across restarts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix rebase Created 8 years, 4 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') | sync/internal_api/public/sync_manager.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 8
9 namespace prefs { 9 namespace prefs {
10 10
(...skipping 1628 matching lines...) Expand 10 before | Expand all | Expand 10 after
1639 // while max invalidation version is an int64; both are stored as string 1639 // while max invalidation version is an int64; both are stored as string
1640 // representations though. 1640 // representations though.
1641 const char kInvalidatorMaxInvalidationVersions[] = 1641 const char kInvalidatorMaxInvalidationVersions[] =
1642 "invalidator.max_invalidation_versions"; 1642 "invalidator.max_invalidation_versions";
1643 1643
1644 // A string that can be used to restore sync encryption infrastructure on 1644 // A string that can be used to restore sync encryption infrastructure on
1645 // startup so that the user doesn't need to provide credentials on each start. 1645 // startup so that the user doesn't need to provide credentials on each start.
1646 const char kSyncEncryptionBootstrapToken[] = 1646 const char kSyncEncryptionBootstrapToken[] =
1647 "sync.encryption_bootstrap_token"; 1647 "sync.encryption_bootstrap_token";
1648 1648
1649 // Same as kSyncEncryptionBootstrapToken, but derived from the keystore key,
1650 // so we don't have to do a GetKey command at restart.
1651 const char kSyncKeystoreEncryptionBootstrapToken[] =
1652 "sync.keystore_encryption_bootstrap_token";
1653
1649 // Boolean tracking whether the user chose to specify a secondary encryption 1654 // Boolean tracking whether the user chose to specify a secondary encryption
1650 // passphrase. 1655 // passphrase.
1651 const char kSyncUsingSecondaryPassphrase[] = "sync.using_secondary_passphrase"; 1656 const char kSyncUsingSecondaryPassphrase[] = "sync.using_secondary_passphrase";
1652 1657
1653 // String that identifies the user logged into sync and other google services. 1658 // String that identifies the user logged into sync and other google services.
1654 const char kGoogleServicesUsername[] = "google.services.username"; 1659 const char kGoogleServicesUsername[] = "google.services.username";
1655 1660
1656 // Local state pref containing a string regex that restricts which accounts 1661 // Local state pref containing a string regex that restricts which accounts
1657 // can be used to log in to chrome (e.g. "*@google.com"). If missing or blank, 1662 // can be used to log in to chrome (e.g. "*@google.com"). If missing or blank,
1658 // all accounts are allowed (no restrictions). 1663 // all accounts are allowed (no restrictions).
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
2013 const char kNetworkProfileLastWarningTime[] = 2018 const char kNetworkProfileLastWarningTime[] =
2014 "network_profile.last_warning_time"; 2019 "network_profile.last_warning_time";
2015 2020
2016 #if defined(OS_MACOSX) 2021 #if defined(OS_MACOSX)
2017 // A timestamp of when the obsolete OS infobar was last shown to a user on 10.5. 2022 // A timestamp of when the obsolete OS infobar was last shown to a user on 10.5.
2018 const char kMacLeopardObsoleteInfobarLastShown[] = 2023 const char kMacLeopardObsoleteInfobarLastShown[] =
2019 "mac_105_obsolete_infobar_last_shown"; 2024 "mac_105_obsolete_infobar_last_shown";
2020 #endif // defined(OS_MACOSX) 2025 #endif // defined(OS_MACOSX)
2021 2026
2022 } // namespace prefs 2027 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | sync/internal_api/public/sync_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698