Commit cbd511b8 authored by ericwilligers's avatar ericwilligers Committed by Commit bot

Reduce usage of FOR_EACH_OBSERVER macro in chrome/browser/signin

Observer lists now support range-based for loops.

BUG=655021

Review-Url: https://chromiumcodereview.appspot.com/2435533004
Cr-Commit-Position: refs/heads/master@{#426951}
parent e30a06a8
......@@ -224,7 +224,8 @@ DownloadHistory::DownloadHistory(content::DownloadManager* manager,
DownloadHistory::~DownloadHistory() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
FOR_EACH_OBSERVER(Observer, observers_, OnDownloadHistoryDestroyed());
for (Observer& observer : observers_)
observer.OnDownloadHistoryDestroyed();
observers_.Clear();
}
......@@ -288,7 +289,8 @@ void DownloadHistory::QueryCallback(std::unique_ptr<InfoVector> infos) {
notifier_.GetManager()->CheckForHistoryFilesRemoval();
initial_history_query_complete_ = true;
FOR_EACH_OBSERVER(Observer, observers_, OnHistoryQueryComplete());
for (Observer& observer : observers_)
observer.OnHistoryQueryComplete();
}
void DownloadHistory::MaybeAddToHistory(content::DownloadItem* item) {
......@@ -316,8 +318,8 @@ void DownloadHistory::MaybeAddToHistory(content::DownloadItem* item) {
history_->CreateDownload(*data->info(), base::Bind(
&DownloadHistory::ItemAdded, weak_ptr_factory_.GetWeakPtr(),
download_id));
FOR_EACH_OBSERVER(Observer, observers_, OnDownloadStored(
item, *data->info()));
for (Observer& observer : observers_)
observer.OnDownloadStored(item, *data->info());
}
void DownloadHistory::ItemAdded(uint32_t download_id, bool success) {
......@@ -364,8 +366,8 @@ void DownloadHistory::ItemAdded(uint32_t download_id, bool success) {
// Notify the observer about the change in the persistence state.
if (was_persisted != IsPersisted(item)) {
FOR_EACH_OBSERVER(Observer, observers_, OnDownloadStored(
item, *data->info()));
for (Observer& observer : observers_)
observer.OnDownloadStored(item, *data->info());
}
// In case the item changed or became temporary while it was being added.
......@@ -410,8 +412,8 @@ void DownloadHistory::OnDownloadUpdated(
should_update, 2);
if (should_update) {
history_->UpdateDownload(current_info);
FOR_EACH_OBSERVER(Observer, observers_, OnDownloadStored(
item, current_info));
for (Observer& observer : observers_)
observer.OnDownloadStored(item, current_info);
}
if (item->GetState() == content::DownloadItem::IN_PROGRESS) {
data->set_info(current_info);
......@@ -465,5 +467,6 @@ void DownloadHistory::RemoveDownloadsBatch() {
IdSet remove_ids;
removing_ids_.swap(remove_ids);
history_->RemoveDownloads(remove_ids);
FOR_EACH_OBSERVER(Observer, observers_, OnDownloadsRemoved(remove_ids));
for (Observer& observer : observers_)
observer.OnDownloadsRemoved(remove_ids);
}
......@@ -283,8 +283,8 @@ void CrossDevicePromo::MarkPromoShouldBeShown() {
if (!prefs_->GetBoolean(prefs::kCrossDevicePromoShouldBeShown)) {
prefs_->SetBoolean(prefs::kCrossDevicePromoShouldBeShown, true);
FOR_EACH_OBSERVER(CrossDevicePromo::Observer, observer_list_,
OnPromoEligibilityChanged(true));
for (CrossDevicePromo::Observer& observer : observer_list_)
observer.OnPromoEligibilityChanged(true);
}
}
......@@ -292,8 +292,8 @@ void CrossDevicePromo::MarkPromoShouldNotBeShown() {
VLOG(1) << "CrossDevicePromo::MarkPromoShouldNotBeShown.";
if (prefs_->GetBoolean(prefs::kCrossDevicePromoShouldBeShown)) {
prefs_->SetBoolean(prefs::kCrossDevicePromoShouldBeShown, false);
FOR_EACH_OBSERVER(CrossDevicePromo::Observer, observer_list_,
OnPromoEligibilityChanged(false));
for (CrossDevicePromo::Observer& observer : observer_list_)
observer.OnPromoEligibilityChanged(false);
}
}
......
......@@ -494,8 +494,8 @@ bool EasyUnlockService::UpdateScreenlockState(ScreenlockState state) {
HandleAuthFailure(GetAccountId());
}
FOR_EACH_OBSERVER(
EasyUnlockServiceObserver, observers_, OnScreenlockStateChanged(state));
for (EasyUnlockServiceObserver& observer : observers_)
observer.OnScreenlockStateChanged(state);
return true;
}
......@@ -723,8 +723,8 @@ void EasyUnlockService::NotifyUserUpdated() {
}
void EasyUnlockService::NotifyTurnOffOperationStatusChanged() {
FOR_EACH_OBSERVER(
EasyUnlockServiceObserver, observers_, OnTurnOffOperationStatusChanged());
for (EasyUnlockServiceObserver& observer : observers_)
observer.OnTurnOffOperationStatusChanged();
}
void EasyUnlockService::ResetScreenlockState() {
......
......@@ -100,7 +100,8 @@ void SigninManagerFactory::RemoveObserver(Observer* observer) {
void SigninManagerFactory::NotifyObserversOfSigninManagerCreationForTesting(
SigninManagerBase* manager) {
FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerCreated(manager));
for (Observer& observer : observer_list_)
observer.SigninManagerCreated(manager);
}
KeyedService* SigninManagerFactory::BuildServiceInstanceFor(
......@@ -122,7 +123,8 @@ KeyedService* SigninManagerFactory::BuildServiceInstanceFor(
AccountFetcherServiceFactory::GetForProfile(profile);
#endif
service->Initialize(g_browser_process->local_state());
FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerCreated(service));
for (Observer& observer : observer_list_)
observer.SigninManagerCreated(service);
return service;
}
......@@ -130,7 +132,9 @@ void SigninManagerFactory::BrowserContextShutdown(
content::BrowserContext* context) {
SigninManagerBase* manager = static_cast<SigninManagerBase*>(
GetServiceForBrowserContext(context, false));
if (manager)
FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerShutdown(manager));
if (manager) {
for (Observer& observer : observer_list_)
observer.SigninManagerShutdown(manager);
}
BrowserContextKeyedServiceFactory::BrowserContextShutdown(context);
}
......@@ -28,12 +28,14 @@ bool StatusIcon::HasObservers() const {
}
void StatusIcon::DispatchClickEvent() {
FOR_EACH_OBSERVER(StatusIconObserver, observers_, OnStatusIconClicked());
for (StatusIconObserver& observer : observers_)
observer.OnStatusIconClicked();
}
#if defined(OS_WIN)
void StatusIcon::DispatchBalloonClickEvent() {
FOR_EACH_OBSERVER(StatusIconObserver, observers_, OnBalloonClicked());
for (StatusIconObserver& observer : observers_)
observer.OnBalloonClicked();
}
#endif
......
......@@ -163,7 +163,8 @@ void StatusIconMenuModel::MenuItemsChanged() {
}
void StatusIconMenuModel::NotifyMenuStateChanged() {
FOR_EACH_OBSERVER(Observer, observer_list_, OnMenuStateChanged());
for (Observer& observer : observer_list_)
observer.OnMenuStateChanged();
}
////////////////////////////////////////////////////////////////////////////////
......
......@@ -187,8 +187,8 @@ class TestSyncProcessorStub : public syncer::SyncChangeProcessor {
void NotifyLocalChangeObservers() {
const syncer::SyncChange empty_change;
FOR_EACH_OBSERVER(syncer::LocalChangeObserver, local_change_observers_,
OnLocalChange(NULL, empty_change));
for (syncer::LocalChangeObserver& observer : local_change_observers_)
observer.OnLocalChange(NULL, empty_change);
}
void FailProcessSyncChangesWith(const syncer::SyncError& error) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment