diff options
Diffstat (limited to 'chromium/components/signin/internal/identity_manager/primary_account_manager.cc')
-rw-r--r-- | chromium/components/signin/internal/identity_manager/primary_account_manager.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/chromium/components/signin/internal/identity_manager/primary_account_manager.cc b/chromium/components/signin/internal/identity_manager/primary_account_manager.cc index 741a2b973ef..9d0a7c78946 100644 --- a/chromium/components/signin/internal/identity_manager/primary_account_manager.cc +++ b/chromium/components/signin/internal/identity_manager/primary_account_manager.cc @@ -12,12 +12,12 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" +#include "base/observer_list.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/signin/internal/identity_manager/account_tracker_service.h" -#include "components/signin/internal/identity_manager/primary_account_policy_manager.h" #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h" #include "components/signin/public/base/account_consistency_method.h" #include "components/signin/public/base/signin_client.h" @@ -30,13 +30,10 @@ using signin::PrimaryAccountChangeEvent; PrimaryAccountManager::PrimaryAccountManager( SigninClient* client, ProfileOAuth2TokenService* token_service, - AccountTrackerService* account_tracker_service, - std::unique_ptr<PrimaryAccountPolicyManager> policy_manager) + AccountTrackerService* account_tracker_service) : client_(client), token_service_(token_service), - account_tracker_service_(account_tracker_service), - initialized_(false), - policy_manager_(std::move(policy_manager)) { + account_tracker_service_(account_tracker_service) { DCHECK(client_); DCHECK(account_tracker_service_); } @@ -119,9 +116,6 @@ void PrimaryAccountManager::Initialize(PrefService* local_state) { SetPrimaryAccountInternal(account_info, consented); } - if (policy_manager_) { - policy_manager_->InitializePolicy(local_state, this); - } // It is important to only load credentials after starting to observe the // token service. token_service_->AddObserver(this); |