Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: chromeos/audio/cras_audio_handler.cc

Issue 2413963002: Replace FOR_EACH_OBSERVER in chromeos/ with range-based for (Closed)
Patch Set: Run the script again with '/mg' Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/audio/audio_devices_pref_handler_impl.cc ('k') | chromeos/cert_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/audio/cras_audio_handler.cc
diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc
index c085b4a2d57aa9775f55bcf5fd1e47a7150789b6..d75f3e3718513e17b916936d0ad20480ae359214 100644
--- a/chromeos/audio/cras_audio_handler.cc
+++ b/chromeos/audio/cras_audio_handler.cc
@@ -348,9 +348,8 @@ void CrasAudioHandler::SetOutputMono(bool mono_on) {
SetGlobalOutputChannelRemix(output_channels_, kStereoToStereo);
}
- FOR_EACH_OBSERVER(
- AudioObserver, observers_,
- OnOuputChannelRemixingChanged(mono_on));
+ for (auto& observer : observers_)
+ observer.OnOuputChannelRemixingChanged(mono_on);
}
bool CrasAudioHandler::IsOutputMonoEnabled() const {
@@ -413,9 +412,8 @@ void CrasAudioHandler::SetOutputMute(bool mute_on) {
}
}
- FOR_EACH_OBSERVER(
- AudioObserver, observers_,
- OnOutputMuteChanged(output_mute_on_, false /* system_adjust */));
+ for (auto& observer : observers_)
+ observer.OnOutputMuteChanged(output_mute_on_, false /* system_adjust */);
}
void CrasAudioHandler::AdjustOutputVolumeToAudibleLevel() {
@@ -428,8 +426,8 @@ void CrasAudioHandler::AdjustOutputVolumeToAudibleLevel() {
void CrasAudioHandler::SetInputMute(bool mute_on) {
SetInputMuteInternal(mute_on);
- FOR_EACH_OBSERVER(AudioObserver, observers_,
- OnInputMuteChanged(input_mute_on_));
+ for (auto& observer : observers_)
+ observer.OnInputMuteChanged(input_mute_on_);
}
void CrasAudioHandler::SetActiveDevice(const AudioDevice& active_device,
@@ -647,8 +645,8 @@ void CrasAudioHandler::OutputNodeVolumeChanged(uint64_t node_id, int volume) {
initializing_audio_state_ = false;
if (should_notify) {
- FOR_EACH_OBSERVER(AudioObserver, observers_,
- OnOutputNodeVolumeChanged(node_id, volume));
+ for (auto& observer : observers_)
+ observer.OnOutputNodeVolumeChanged(node_id, volume);
}
}
@@ -886,8 +884,8 @@ void CrasAudioHandler::SetInputNodeGainPercent(uint64_t node_id,
if (device->active) {
SetInputNodeGain(node_id, gain_percent);
- FOR_EACH_OBSERVER(AudioObserver, observers_,
- OnInputNodeGainChanged(node_id, gain_percent));
+ for (auto& observer : observers_)
+ observer.OnInputNodeGainChanged(node_id, gain_percent);
}
}
@@ -1017,9 +1015,11 @@ CrasAudioHandler::DeviceStatus CrasAudioHandler::CheckDeviceStatus(
void CrasAudioHandler::NotifyActiveNodeChanged(bool is_input) {
if (is_input)
- FOR_EACH_OBSERVER(AudioObserver, observers_, OnActiveInputNodeChanged());
+ for (auto& observer : observers_)
+ observer.OnActiveInputNodeChanged();
else
- FOR_EACH_OBSERVER(AudioObserver, observers_, OnActiveOutputNodeChanged());
+ for (auto& observer : observers_)
+ observer.OnActiveOutputNodeChanged();
}
bool CrasAudioHandler::GetActiveDeviceFromUserPref(bool is_input,
@@ -1300,7 +1300,8 @@ void CrasAudioHandler::HandleGetNodes(const chromeos::AudioNodeList& node_list,
}
UpdateDevicesAndSwitchActive(node_list);
- FOR_EACH_OBSERVER(AudioObserver, observers_, OnAudioNodesChanged());
+ for (auto& observer : observers_)
+ observer.OnAudioNodesChanged();
}
void CrasAudioHandler::HandleGetNodesError(const std::string& error_name,
@@ -1374,9 +1375,10 @@ void CrasAudioHandler::UpdateAudioAfterHDMIRediscoverGracePeriod() {
SetOutputMuteInternal(false);
// Notify UI about the mute state change.
- FOR_EACH_OBSERVER(
- AudioObserver, observers_,
- OnOutputMuteChanged(output_mute_on_, true /* system adjustment */));
+ for (auto& observer : observers_) {
+ observer.OnOutputMuteChanged(output_mute_on_,
+ true /* system adjustment */);
+ }
}
}
« no previous file with comments | « chromeos/audio/audio_devices_pref_handler_impl.cc ('k') | chromeos/cert_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698