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

Side by Side Diff: chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h

Issue 572873002: Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build break fixed Created 6 years, 3 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
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 #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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 const std::string& sanitized_username); 121 const std::string& sanitized_username);
122 122
123 scoped_ptr<UserCloudPolicyValidator> CreateValidatorForLoad( 123 scoped_ptr<UserCloudPolicyValidator> CreateValidatorForLoad(
124 scoped_ptr<enterprise_management::PolicyFetchResponse> policy); 124 scoped_ptr<enterprise_management::PolicyFetchResponse> policy);
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 std::string username_; 128 const std::string username_;
129 base::FilePath user_policy_key_dir_; 129 base::FilePath user_policy_key_dir_;
130 130
131 base::WeakPtrFactory<UserCloudPolicyStoreChromeOS> weak_factory_;
132
133 // TODO(mnissler): Remove all the legacy policy support members below after 131 // TODO(mnissler): Remove all the legacy policy support members below after
134 // the number of pre-M20 clients drops back to zero. 132 // the number of pre-M20 clients drops back to zero.
135 base::FilePath legacy_cache_dir_; 133 base::FilePath legacy_cache_dir_;
136 scoped_ptr<LegacyPolicyCacheLoader> legacy_loader_; 134 scoped_ptr<LegacyPolicyCacheLoader> legacy_loader_;
137 bool legacy_caches_loaded_; 135 bool legacy_caches_loaded_;
138 136
139 bool policy_key_loaded_; 137 bool policy_key_loaded_;
140 base::FilePath policy_key_path_; 138 base::FilePath policy_key_path_;
141 std::string policy_key_; 139 std::string policy_key_;
142 140
141 base::WeakPtrFactory<UserCloudPolicyStoreChromeOS> weak_factory_;
142
143 DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyStoreChromeOS); 143 DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyStoreChromeOS);
144 }; 144 };
145 145
146 } // namespace policy 146 } // namespace policy
147 147
148 #endif // CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_ 148 #endif // CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_STORE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698