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

Unified Diff: components/zoom/zoom_controller.cc

Issue 2430823002: Reduce usage of FOR_EACH_OBSERVER macro in components/ (Closed)
Patch Set: 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 | « components/wallpaper/wallpaper_resizer.cc ('k') | components/zoom/zoom_event_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/zoom/zoom_controller.cc
diff --git a/components/zoom/zoom_controller.cc b/components/zoom/zoom_controller.cc
index 1fa5f7f6382c4f20e1c0c6ee65b89a261500230d..a28a01dcef71663f17c63d79aeb66ae9d0ecd8bc 100644
--- a/components/zoom/zoom_controller.cc
+++ b/components/zoom/zoom_controller.cc
@@ -127,8 +127,8 @@ bool ZoomController::SetZoomLevelByClient(
ZoomChangedEventData zoom_change_data(web_contents(), old_zoom_level,
zoom_level_, zoom_mode_,
can_show_bubble);
- FOR_EACH_OBSERVER(ZoomObserver, observers_,
- OnZoomChanged(zoom_change_data));
+ for (auto& observer : observers_)
+ observer.OnZoomChanged(zoom_change_data);
last_client_ = NULL;
return true;
@@ -221,8 +221,8 @@ void ZoomController::SetZoomMode(ZoomMode new_mode) {
} else {
// When we don't call any HostZoomMap set functions, we send the event
// manually.
- FOR_EACH_OBSERVER(ZoomObserver, observers_,
- OnZoomChanged(*event_data_));
+ for (auto& observer : observers_)
+ observer.OnZoomChanged(*event_data_);
event_data_.reset();
}
break;
@@ -238,8 +238,8 @@ void ZoomController::SetZoomMode(ZoomMode new_mode) {
} else {
// When we don't call any HostZoomMap set functions, we send the event
// manually.
- FOR_EACH_OBSERVER(ZoomObserver, observers_,
- OnZoomChanged(*event_data_));
+ for (auto& observer : observers_)
+ observer.OnZoomChanged(*event_data_);
event_data_.reset();
}
break;
@@ -346,8 +346,8 @@ void ZoomController::UpdateState(const std::string& host) {
// The zoom bubble should not be shown for zoom changes where the host
// is empty.
zoom_change_data.can_show_bubble = can_show_bubble_ && !host.empty();
- FOR_EACH_OBSERVER(ZoomObserver, observers_,
- OnZoomChanged(zoom_change_data));
+ for (auto& observer : observers_)
+ observer.OnZoomChanged(zoom_change_data);
} else {
// TODO(wjmaclean) Should we consider having HostZoomMap send both old and
// new zoom levels here?
@@ -356,8 +356,8 @@ void ZoomController::UpdateState(const std::string& host) {
ZoomChangedEventData zoom_change_data(web_contents(), zoom_level,
zoom_level, zoom_mode_,
false /* can_show_bubble */);
- FOR_EACH_OBSERVER(ZoomObserver, observers_,
- OnZoomChanged(zoom_change_data));
+ for (auto& observer : observers_)
+ observer.OnZoomChanged(zoom_change_data);
}
}
« no previous file with comments | « components/wallpaper/wallpaper_resizer.cc ('k') | components/zoom/zoom_event_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698