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

Unified Diff: chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc

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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
index cb8e25b2631ba7e76c47813d7db0d5d8f334a3b7..2f2f86f2fb7543152c1160fe3662f470fb8243cb 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
@@ -92,8 +92,6 @@ class LegacyPolicyCacheLoader : public UserPolicyTokenLoader::Delegate,
static CloudPolicyStore::Status TranslateLoadResult(
UserPolicyDiskCache::LoadResult result);
- base::WeakPtrFactory<LegacyPolicyCacheLoader> weak_factory_;
-
scoped_refptr<UserPolicyTokenLoader> token_loader_;
scoped_refptr<UserPolicyDiskCache> policy_cache_;
@@ -105,6 +103,8 @@ class LegacyPolicyCacheLoader : public UserPolicyTokenLoader::Delegate,
Callback callback_;
+ base::WeakPtrFactory<LegacyPolicyCacheLoader> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(LegacyPolicyCacheLoader);
};
@@ -112,9 +112,9 @@ LegacyPolicyCacheLoader::LegacyPolicyCacheLoader(
const base::FilePath& token_cache_file,
const base::FilePath& policy_cache_file,
scoped_refptr<base::SequencedTaskRunner> background_task_runner)
- : weak_factory_(this),
- has_policy_(false),
- status_(CloudPolicyStore::STATUS_OK) {
+ : has_policy_(false),
+ status_(CloudPolicyStore::STATUS_OK),
+ weak_factory_(this) {
token_loader_ = new UserPolicyTokenLoader(weak_factory_.GetWeakPtr(),
token_cache_file,
background_task_runner);
@@ -186,13 +186,13 @@ UserCloudPolicyStoreChromeOS::UserCloudPolicyStoreChromeOS(
session_manager_client_(session_manager_client),
username_(username),
user_policy_key_dir_(user_policy_key_dir),
- weak_factory_(this),
legacy_cache_dir_(legacy_token_cache_file.DirName()),
legacy_loader_(new LegacyPolicyCacheLoader(legacy_token_cache_file,
legacy_policy_cache_file,
background_task_runner)),
legacy_caches_loaded_(false),
- policy_key_loaded_(false) {}
+ policy_key_loaded_(false),
+ weak_factory_(this) {}
UserCloudPolicyStoreChromeOS::~UserCloudPolicyStoreChromeOS() {}

Powered by Google App Engine
This is Rietveld 408576698