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; |
| 136 | 136 |
| 137 bool policy_key_loaded_; | 137 const std::string owning_domain_; |
|
Thiemo Nagel
2016/11/21 17:45:34
Afaics, |owning_domain_| is only used in one place
emaxx
2016/11/21 20:04:58
That's true, rebasing eliminated all other usages.
| |
| 138 | |
| 139 bool is_policy_key_loaded_ = false; | |
| 138 base::FilePath policy_key_path_; | 140 base::FilePath policy_key_path_; |
| 139 std::string policy_key_; | 141 std::string loaded_policy_key_; |
|
Thiemo Nagel
2016/11/21 17:45:34
I think |loaded_policy_key_| deserves a comment.
emaxx
2016/11/21 20:04:58
Done. Added comment, renamed to "cached_policy_key
| |
| 140 | 142 |
| 141 base::WeakPtrFactory<UserCloudPolicyStoreChromeOS> weak_factory_; | 143 base::WeakPtrFactory<UserCloudPolicyStoreChromeOS> weak_factory_; |
| 142 | 144 |
| 143 DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyStoreChromeOS); | 145 DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyStoreChromeOS); |
| 144 }; | 146 }; |
| 145 | 147 |
| 146 } // namespace policy | 148 } // namespace policy |
| 147 | 149 |
| 148 #endif // CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_ | 150 #endif // CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_ |
| OLD | NEW |