Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_ | 6 #define CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 125 | 125 |
| 126 chromeos::CryptohomeClient* cryptohome_client_; | 126 chromeos::CryptohomeClient* cryptohome_client_; |
| 127 chromeos::SessionManagerClient* session_manager_client_; | 127 chromeos::SessionManagerClient* session_manager_client_; |
| 128 const AccountId account_id_; | 128 const AccountId account_id_; |
| 129 base::FilePath user_policy_key_dir_; | 129 base::FilePath user_policy_key_dir_; |
| 130 | 130 |
| 131 // TODO(mnissler): Remove all the legacy policy support members below after | 131 // TODO(mnissler): Remove all the legacy policy support members below after |
| 132 // the number of pre-M20 clients drops back to zero. | 132 // the number of pre-M20 clients drops back to zero. |
| 133 base::FilePath legacy_cache_dir_; | 133 base::FilePath legacy_cache_dir_; |
| 134 std::unique_ptr<LegacyPolicyCacheLoader> legacy_loader_; | 134 std::unique_ptr<LegacyPolicyCacheLoader> legacy_loader_; |
| 135 bool legacy_caches_loaded_; | 135 bool is_legacy_caches_load_performed_ = false; |
|
Thiemo Nagel
2016/11/22 11:57:15
I guess this will go away after rebase.
emaxx
2016/11/22 16:16:51
Glad to hear that! :)
| |
| 136 | 136 |
| 137 bool policy_key_loaded_; | 137 // The current key used to verify signatures of policy. This value is |
|
Thiemo Nagel
2016/11/22 11:57:15
Nit: Please wrap at 80 characters.
emaxx
2016/11/22 16:16:51
Done.
| |
| 138 base::FilePath policy_key_path_; | 138 // loaded from the key cache file (which is owned and kept up to date by the |
| 139 std::string policy_key_; | 139 // Chrome OS session manager). This is, generally, different from |
| 140 // |policy_signature_public_key_|, which always corresponds to the currently | |
| 141 // effective policy. | |
| 142 std::string cached_policy_key_; | |
| 143 bool is_cached_policy_key_loaded_ = false; | |
|
Thiemo Nagel
2016/11/22 11:57:15
Nit: Imho the "is_" part of the name redundant and
emaxx
2016/11/22 16:16:51
Done.
| |
| 144 base::FilePath cached_policy_key_path_; | |
| 140 | 145 |
| 141 base::WeakPtrFactory<UserCloudPolicyStoreChromeOS> weak_factory_; | 146 base::WeakPtrFactory<UserCloudPolicyStoreChromeOS> weak_factory_; |
| 142 | 147 |
| 143 DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyStoreChromeOS); | 148 DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyStoreChromeOS); |
| 144 }; | 149 }; |
| 145 | 150 |
| 146 } // namespace policy | 151 } // namespace policy |
| 147 | 152 |
| 148 #endif // CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_ | 153 #endif // CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_ |
| OLD | NEW |