From 23a804335e8955cac7825039ce3c40a8a23fc436 Mon Sep 17 00:00:00 2001 From: dmichael Date: Fri, 12 Dec 2014 11:01:47 -0800 Subject: Fix remaining WeakPtrFactory ordering problems in preparation for turning on the check. WeakPtrFactory members should always be last so that they invalidate WeakPtrs prior to other destructors running. These are mostly trivial/mechanical ones. (We'll also need https://codereview.chromium.org/795003003/, which I split out) BUG=303818 TBR=rockot,vitalybuka,cbentzel,shess,dmazzoni,stanisc,sky,tim,mathp,benjhayden,kinuko,scottmg,sergeyu,zork,ddorwin Review URL: https://codereview.chromium.org/780713002 Cr-Commit-Position: refs/heads/master@{#308137} --- components/signin/core/browser/signin_manager.cc | 4 ++-- components/signin/core/browser/signin_manager.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'components/signin') diff --git a/components/signin/core/browser/signin_manager.cc b/components/signin/core/browser/signin_manager.cc index 163204d..9525df0 100644 --- a/components/signin/core/browser/signin_manager.cc +++ b/components/signin/core/browser/signin_manager.cc @@ -68,9 +68,9 @@ SigninManager::SigninManager(SigninClient* client, client_(client), token_service_(token_service), account_tracker_service_(account_tracker_service), - weak_pointer_factory_(this), signin_manager_signed_in_(false), - user_info_fetched_by_account_tracker_(false) {} + user_info_fetched_by_account_tracker_(false), + weak_pointer_factory_(this) {} void SigninManager::AddMergeSessionObserver( MergeSessionHelper::Observer* observer) { diff --git a/components/signin/core/browser/signin_manager.h b/components/signin/core/browser/signin_manager.h index 04b645a..47e70d07 100644 --- a/components/signin/core/browser/signin_manager.h +++ b/components/signin/core/browser/signin_manager.h @@ -226,14 +226,14 @@ class SigninManager : public SigninManagerBase, // Helper to merge signed in account into the content area. scoped_ptr merge_session_helper_; - base::WeakPtrFactory weak_pointer_factory_; - // Two gate conditions for when PostSignedIn should be called. Verify // that the SigninManager has reached OnSignedIn() and the AccountTracker // has completed calling GetUserInfo. bool signin_manager_signed_in_; bool user_info_fetched_by_account_tracker_; + base::WeakPtrFactory weak_pointer_factory_; + DISALLOW_COPY_AND_ASSIGN(SigninManager); }; -- cgit v1.1