| Index: chrome/browser/supervised_user/supervised_user_settings_service.cc
|
| diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc
|
| index 40eb8ac3def658317f9f666a9de95949246d9757..239d2914ee82b03d5dea0347c7a1470aa10f0825 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_settings_service.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_settings_service.cc
|
| @@ -85,14 +85,15 @@ void SupervisedUserSettingsService::Init(
|
| store_->AddObserver(this);
|
| }
|
|
|
| -void SupervisedUserSettingsService::Subscribe(
|
| +scoped_ptr<SupervisedUserSettingsService::SettingsCallbackList::Subscription>
|
| + SupervisedUserSettingsService::Subscribe(
|
| const SettingsCallback& callback) {
|
| if (IsReady()) {
|
| scoped_ptr<base::DictionaryValue> settings = GetSettings();
|
| callback.Run(settings.get());
|
| }
|
|
|
| - subscribers_.push_back(callback);
|
| + return callback_list_.Add(callback);
|
| }
|
|
|
| void SupervisedUserSettingsService::SetActive(bool active) {
|
| @@ -406,6 +407,5 @@ void SupervisedUserSettingsService::InformSubscribers() {
|
| return;
|
|
|
| scoped_ptr<base::DictionaryValue> settings = GetSettings();
|
| - for (const auto& callback : subscribers_)
|
| - callback.Run(settings.get());
|
| + callback_list_.Notify(settings.get());
|
| }
|
|
|