Reduce usage of FOR_EACH_OBSERVER macro in components/

components/zoom/zoom_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/zoom/zoom_controller.h"
 
 #include "components/zoom/zoom_event_manager.h"
 #include "components/zoom/zoom_observer.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/navigation_details.h"
@@ skipping 109 matching lines @@
     ZoomEventManager::GetForBrowserContext(browser_context_)
         ->OnZoomLevelChanged(change);
 
     bool can_show_bubble = can_show_bubble_;
     if (client && client->ShouldSuppressBubble())
       can_show_bubble = false;
 
     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;
   }
 
   content::HostZoomMap* zoom_map =
       content::HostZoomMap::GetForWebContents(web_contents());
   DCHECK(zoom_map);
   DCHECK(!event_data_);
   event_data_.reset(new ZoomChangedEventData(web_contents(), GetZoomLevel(),
@@ skipping 72 matching lines @@
     case ZOOM_MODE_ISOLATED: {
       // Unless the zoom mode was |ZOOM_MODE_DISABLED| before this call, the
       // page needs an initial isolated zoom back to the same level it was at
       // in the other mode.
       if (zoom_mode_ != ZOOM_MODE_DISABLED) {
         zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
                                         original_zoom_level);
       } 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;
     }
     case ZOOM_MODE_MANUAL: {
       // Unless the zoom mode was |ZOOM_MODE_DISABLED| before this call, the
       // page needs to be resized to the default zoom. While in manual mode,
       // the zoom level is handled independently.
       if (zoom_mode_ != ZOOM_MODE_DISABLED) {
         zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
                                         GetDefaultZoomLevel());
         zoom_level_ = original_zoom_level;
       } 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;
     }
     case ZOOM_MODE_DISABLED: {
       // The page needs to be zoomed back to default before disabling the zoom
       double new_zoom_level = GetDefaultZoomLevel();
       event_data_->new_zoom_level = new_zoom_level;
       zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
                                       new_zoom_level);
@@ skipping 86 matching lines @@
   }
 
   if (event_data_) {
     // For state changes initiated within the ZoomController, information about
     // the change should be sent.
     ZoomChangedEventData zoom_change_data = *event_data_;
     event_data_.reset();
     // 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?
     double zoom_level = GetZoomLevel();
     // We never show a zoom bubble for an event we didn't generate.
     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);
   }
 }
 
 void ZoomController::SetPageScaleFactorIsOneForTesting(bool is_one) {
   int render_process_id = web_contents()->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
   host_zoom_map_->SetPageScaleFactorIsOneForView(render_process_id,
                                                  render_view_id, is_one);
 }
 
 bool ZoomController::PageScaleFactorIsOne() const {
   return content::HostZoomMap::PageScaleFactorIsOne(web_contents());
 }
 
 }  // namespace zoom