| Index: chrome/browser/supervised_user/supervised_user_service.cc
|
| diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
|
| index 596f14a084262f22ccf2e13fed566364e3a1b01d..d130eb31cc16eadda02c70cf5385fa721edcc141 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_service.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_service.cc
|
| @@ -66,6 +66,10 @@ using base::DictionaryValue;
|
| using base::UserMetricsAction;
|
| using content::BrowserThread;
|
|
|
| +bool SupervisedUserService::Delegate::IsChildAccount() const {
|
| + return false;
|
| +}
|
| +
|
| base::FilePath SupervisedUserService::Delegate::GetBlacklistPath() const {
|
| return base::FilePath();
|
| }
|
| @@ -622,9 +626,7 @@ void SupervisedUserService::OnPermissionRequestIssued(
|
| }
|
|
|
| void SupervisedUserService::OnSupervisedUserIdChanged() {
|
| - std::string supervised_user_id =
|
| - profile_->GetPrefs()->GetString(prefs::kSupervisedUserId);
|
| - SetActive(!supervised_user_id.empty());
|
| + SetActive(ProfileIsSupervised());
|
| }
|
|
|
| void SupervisedUserService::OnDefaultFilteringBehaviorChanged() {
|
| @@ -692,6 +694,10 @@ void SupervisedUserService::AddAccessRequest(const GURL& url,
|
| 0);
|
| }
|
|
|
| +bool SupervisedUserService::IsChildAccount() const {
|
| + return delegate_ && delegate_->IsChildAccount();
|
| +}
|
| +
|
| void SupervisedUserService::InitSync(const std::string& refresh_token) {
|
| StartSetupSync();
|
|
|
|
|