Chromium Code Reviews| Index: chrome/browser/supervised_user/child_accounts/child_account_service.cc |
| diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service.cc b/chrome/browser/supervised_user/child_accounts/child_account_service.cc |
| index 25eb5ce9e906367e9d6c354caafe7c16257112d4..8ff9fb1d9307d2c3044a18dc01fbdbb701c0cad6 100644 |
| --- a/chrome/browser/supervised_user/child_accounts/child_account_service.cc |
| +++ b/chrome/browser/supervised_user/child_accounts/child_account_service.cc |
| @@ -26,6 +26,7 @@ |
| #include "chrome/common/chrome_paths.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/pref_names.h" |
| +#include "components/pref_registry/pref_registry_syncable.h" |
| #include "components/signin/core/browser/profile_oauth2_token_service.h" |
| #include "components/signin/core/browser/signin_manager.h" |
| @@ -75,6 +76,15 @@ ChildAccountService::ChildAccountService(Profile* profile) |
| ChildAccountService::~ChildAccountService() {} |
| +// static |
| +void ChildAccountService::RegisterProfilePrefs( |
| + user_prefs::PrefRegistrySyncable* registry) { |
| + registry->RegisterBooleanPref( |
| + prefs::kChildAccountStatusKnown, |
| + false, |
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| +} |
| + |
| void ChildAccountService::SetIsChildAccount(bool is_child_account) { |
| PropagateChildStatusToUser(is_child_account); |
| if (profile_->IsChild() == is_child_account) |
| @@ -101,6 +111,10 @@ void ChildAccountService::Init() { |
| StartFetchingServiceFlags(); |
| } |
| +bool ChildAccountService::IsChildAccountStatusKnown() { |
| + return profile_->GetPrefs()->GetBoolean(prefs::kChildAccountStatusKnown); |
| +} |
| + |
| void ChildAccountService::Shutdown() { |
| family_fetcher_.reset(); |
| CancelFetchingServiceFlags(); |
| @@ -109,6 +123,16 @@ void ChildAccountService::Shutdown() { |
| SigninManagerFactory::GetForProfile(profile_)->RemoveObserver(this); |
| } |
| +void ChildAccountService::AddStatusObserver( |
| + ChildAccountStatusObserver* observer) { |
| + observer_list_.AddObserver(observer); |
| +} |
| + |
| +void ChildAccountService::RemoveStatusObserver( |
| + ChildAccountStatusObserver* observer) { |
| + observer_list_.RemoveObserver(observer); |
| +} |
| + |
| bool ChildAccountService::SetActive(bool active) { |
| if (!profile_->IsChild() && !active_) |
| return false; |
| @@ -301,6 +325,16 @@ void ChildAccountService::OnFlagsFetched( |
| bool is_child_account = |
| std::find(flags.begin(), flags.end(), |
| kIsChildAccountServiceFlagName) != flags.end(); |
| + |
| + bool status_was_known = profile_->GetPrefs()->GetBoolean( |
| + prefs::kChildAccountStatusKnown); |
| + profile_->GetPrefs()->SetBoolean(prefs::kChildAccountStatusKnown, true); |
| + |
| + if (status_was_known) { |
|
Marc Treib
2015/03/05 10:08:07
Wait, if the status was *not* known before, then s
merkulova
2015/03/10 09:18:22
Good catch, thank you.
Marc Treib
2015/03/10 09:26:17
I meant that we should notify observers whenever t
|
| + FOR_EACH_OBSERVER(ChildAccountStatusObserver, observer_list_, |
| + OnChildAccountStatusChanged()); |
| + } |
| + |
| SetIsChildAccount(is_child_account); |
| ScheduleNextStatusFlagUpdate( |