Remove FOR_EACH_OBSERVER macro usage in chrome/browser/supervised_user
Observer lists now support range-based for loops.
BUG=655021
Review-Url: https://chromiumcodereview.appspot.com/2438513002
Cr-Commit-Position: refs/heads/master@{#426307}
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index 4ac24a6..545379c 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -657,8 +657,8 @@
}
url_filter_context_.Clear();
- FOR_EACH_OBSERVER(
- SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged());
+ for (SupervisedUserServiceObserver& observer : observer_list_)
+ observer.OnURLFilterChanged();
#if !defined(OS_ANDROID)
if (waiting_for_sync_initialization_)
@@ -753,8 +753,8 @@
}
void SupervisedUserService::OnCustodianInfoChanged() {
- FOR_EACH_OBSERVER(
- SupervisedUserServiceObserver, observer_list_, OnCustodianInfoChanged());
+ for (SupervisedUserServiceObserver& observer : observer_list_)
+ observer.OnCustodianInfoChanged();
}
SupervisedUserSettingsService* SupervisedUserService::GetSettingsService() {
@@ -812,8 +812,8 @@
SupervisedUserURLFilter::BehaviorFromInt(behavior_value);
url_filter_context_.SetDefaultFilteringBehavior(behavior);
- FOR_EACH_OBSERVER(
- SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged());
+ for (SupervisedUserServiceObserver& observer : observer_list_)
+ observer.OnURLFilterChanged();
}
void SupervisedUserService::OnSafeSitesSettingChanged() {
@@ -909,8 +909,8 @@
void SupervisedUserService::UpdateBlacklist() {
bool use_blacklist = supervised_users::IsSafeSitesBlacklistEnabled(profile_);
url_filter_context_.SetBlacklist(use_blacklist ? &blacklist_ : nullptr);
- FOR_EACH_OBSERVER(
- SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged());
+ for (SupervisedUserServiceObserver& observer : observer_list_)
+ observer.OnURLFilterChanged();
}
void SupervisedUserService::UpdateManualHosts() {
@@ -926,8 +926,8 @@
}
url_filter_context_.SetManualHosts(std::move(host_map));
- FOR_EACH_OBSERVER(
- SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged());
+ for (SupervisedUserServiceObserver& observer : observer_list_)
+ observer.OnURLFilterChanged();
}
void SupervisedUserService::UpdateManualURLs() {
@@ -942,8 +942,8 @@
}
url_filter_context_.SetManualURLs(std::move(url_map));
- FOR_EACH_OBSERVER(
- SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged());
+ for (SupervisedUserServiceObserver& observer : observer_list_)
+ observer.OnURLFilterChanged();
}
std::string SupervisedUserService::GetSupervisedUserName() const {
@@ -1281,6 +1281,6 @@
#endif // !defined(OS_ANDROID)
void SupervisedUserService::OnSiteListUpdated() {
- FOR_EACH_OBSERVER(
- SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged());
+ for (SupervisedUserServiceObserver& observer : observer_list_)
+ observer.OnURLFilterChanged();
}