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/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index 9b653b3d7..1cb7570 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -114,8 +114,8 @@
}
TabSpecificContentSettings::~TabSpecificContentSettings() {
- FOR_EACH_OBSERVER(
- SiteDataObserver, observer_list_, ContentSettingsDestroyed());
+ for (SiteDataObserver& observer : observer_list_)
+ observer.ContentSettingsDestroyed();
}
TabSpecificContentSettings* TabSpecificContentSettings::GetForFrame(
@@ -862,7 +862,8 @@
}
void TabSpecificContentSettings::NotifySiteDataObservers() {
- FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed());
+ for (SiteDataObserver& observer : observer_list_)
+ observer.OnSiteDataAccessed();
}
void TabSpecificContentSettings::ClearGeolocationContentSettings() {
diff --git a/chrome/browser/plugins/plugin_installer.cc b/chrome/browser/plugins/plugin_installer.cc
index 68edf89..eab3383 100644
--- a/chrome/browser/plugins/plugin_installer.cc
+++ b/chrome/browser/plugins/plugin_installer.cc
@@ -37,8 +37,8 @@
case DownloadItem::COMPLETE: {
DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
state_ = INSTALLER_STATE_IDLE;
- FOR_EACH_OBSERVER(PluginInstallerObserver, observers_,
- DownloadFinished());
+ for (PluginInstallerObserver& observer : observers_)
+ observer.DownloadFinished();
break;
}
case DownloadItem::CANCELLED: {
@@ -73,8 +73,8 @@
strong_observer_count_--;
observers_.RemoveObserver(observer);
if (strong_observer_count_ == 0) {
- FOR_EACH_OBSERVER(WeakPluginInstallerObserver, weak_observers_,
- OnlyWeakObserversLeft());
+ for (WeakPluginInstallerObserver& observer : weak_observers_)
+ observer.OnlyWeakObserversLeft();
}
}
@@ -102,7 +102,8 @@
content::DownloadManager* download_manager) {
DCHECK_EQ(INSTALLER_STATE_IDLE, state_);
state_ = INSTALLER_STATE_DOWNLOADING;
- FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadStarted());
+ for (PluginInstallerObserver& observer : observers_)
+ observer.DownloadStarted();
std::unique_ptr<content::DownloadUrlParameters> download_parameters(
content::DownloadUrlParameters::CreateForWebContentsMainFrame(
web_contents, plugin_url));
@@ -135,17 +136,20 @@
blink::WebReferrerPolicyDefault),
WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED,
false));
- FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadFinished());
+ for (PluginInstallerObserver& observer : observers_)
+ observer.DownloadFinished();
}
void PluginInstaller::DownloadError(const std::string& msg) {
DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
state_ = INSTALLER_STATE_IDLE;
- FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg));
+ for (PluginInstallerObserver& observer : observers_)
+ observer.DownloadError(msg);
}
void PluginInstaller::DownloadCancelled() {
DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
state_ = INSTALLER_STATE_IDLE;
- FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled());
+ for (PluginInstallerObserver& observer : observers_)
+ observer.DownloadCancelled();
}
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
index b17d4dc..576787d 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
@@ -560,19 +560,18 @@
void SupervisedUserSyncService::NotifySupervisedUserAcknowledged(
const std::string& supervised_user_id) {
- FOR_EACH_OBSERVER(SupervisedUserSyncServiceObserver, observers_,
- OnSupervisedUserAcknowledged(supervised_user_id));
+ for (SupervisedUserSyncServiceObserver& observer : observers_)
+ observer.OnSupervisedUserAcknowledged(supervised_user_id);
}
void SupervisedUserSyncService::NotifySupervisedUsersSyncingStopped() {
- FOR_EACH_OBSERVER(SupervisedUserSyncServiceObserver, observers_,
- OnSupervisedUsersSyncingStopped());
+ for (SupervisedUserSyncServiceObserver& observer : observers_)
+ observer.OnSupervisedUsersSyncingStopped();
}
void SupervisedUserSyncService::NotifySupervisedUsersChanged() {
- FOR_EACH_OBSERVER(SupervisedUserSyncServiceObserver,
- observers_,
- OnSupervisedUsersChanged());
+ for (SupervisedUserSyncServiceObserver& observer : observers_)
+ observer.OnSupervisedUsersChanged();
}
void SupervisedUserSyncService::DispatchCallbacks() {
diff --git a/chrome/browser/supervised_user/supervised_user_pref_store.cc b/chrome/browser/supervised_user/supervised_user_pref_store.cc
index e0d9d94..96ba26e 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc
@@ -166,7 +166,8 @@
}
if (!old_prefs) {
- FOR_EACH_OBSERVER(Observer, observers_, OnInitializationCompleted(true));
+ for (Observer& observer : observers_)
+ observer.OnInitializationCompleted(true);
return;
}
@@ -175,7 +176,8 @@
// Send out change notifications.
for (const std::string& pref : changed_prefs) {
- FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(pref));
+ for (Observer& observer : observers_)
+ observer.OnPrefValueChanged(pref);
}
}
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();
}
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc
index d2263138..f32da08 100644
--- a/chrome/browser/supervised_user/supervised_user_url_filter.cc
+++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc
@@ -425,8 +425,8 @@
if (reason != supervised_user_error_page::DEFAULT || behavior == BLOCK ||
!async_url_checker_) {
callback.Run(behavior, reason, false);
- FOR_EACH_OBSERVER(Observer, observers_,
- OnURLChecked(url, behavior, reason, false));
+ for (Observer& observer : observers_)
+ observer.OnURLChecked(url, behavior, reason, false);
return true;
}
@@ -609,7 +609,8 @@
void SupervisedUserURLFilter::SetContents(std::unique_ptr<Contents> contents) {
DCHECK(CalledOnValidThread());
contents_ = std::move(contents);
- FOR_EACH_OBSERVER(Observer, observers_, OnSiteListUpdated());
+ for (Observer& observer : observers_)
+ observer.OnSiteListUpdated();
}
void SupervisedUserURLFilter::CheckCallback(
@@ -623,8 +624,8 @@
GetBehaviorFromSafeSearchClassification(classification);
callback.Run(behavior, supervised_user_error_page::ASYNC_CHECKER, uncertain);
- FOR_EACH_OBSERVER(
- Observer, observers_,
- OnURLChecked(url, behavior, supervised_user_error_page::ASYNC_CHECKER,
- uncertain));
+ for (Observer& observer : observers_) {
+ observer.OnURLChecked(url, behavior,
+ supervised_user_error_page::ASYNC_CHECKER, uncertain);
+ }
}
