Reduce FOR_EACH_OBSERVER usage in content/browser/renderer_host

content/browser/renderer_host/text_input_manager.cc

 // Copyright 2016 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 "content/browser/renderer_host/text_input_manager.h"
 
 #include "base/strings/string16.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/view_messages.h"
@@ skipping 122 matching lines @@
   // If the state for |active_view_| is none, then we no longer have an
   // |active_view_|.
   if (active_view_ == view && text_input_state.type == ui::TEXT_INPUT_TYPE_NONE)
     active_view_ = nullptr;
 
   NotifyObserversAboutInputStateUpdate(view, changed);
 }
 
 void TextInputManager::ImeCancelComposition(RenderWidgetHostViewBase* view) {
   DCHECK(IsRegistered(view));
-  FOR_EACH_OBSERVER(Observer, observer_list_,
-                    OnImeCancelComposition(this, view));
+  for (auto& observer : observer_list_)
+    observer.OnImeCancelComposition(this, view);
 }
 
 void TextInputManager::SelectionBoundsChanged(
     RenderWidgetHostViewBase* view,
     const ViewHostMsg_SelectionBounds_Params& params) {
   DCHECK(IsRegistered(view));
   // Converting the anchor point to root's coordinate space (for child frame
   // views).
   gfx::Point anchor_origin_transformed =
       view->TransformPointToRootCoordSpace(params.anchor_rect.origin());
@@ skipping 41 matching lines @@
   if (params.anchor_rect == params.focus_rect) {
     selection_region_map_[view].caret_rect.set_origin(
         anchor_origin_transformed);
     selection_region_map_[view].caret_rect.set_size(params.anchor_rect.size());
   }
   selection_region_map_[view].first_selection_rect.set_origin(
       anchor_origin_transformed);
   selection_region_map_[view].first_selection_rect.set_size(
       params.anchor_rect.size());
 
-  FOR_EACH_OBSERVER(Observer, observer_list_,
-                    OnSelectionBoundsChanged(this, view));
+  for (auto& observer : observer_list_)
+    observer.OnSelectionBoundsChanged(this, view);
 }
 
 // TODO(ekaramad): We use |range| only on Mac OS; but we still track its value
 // here for other platforms. See if there is a nice way around this with minimal
 // #ifdefs for platform specific code (https://crbug.com/602427).
 void TextInputManager::ImeCompositionRangeChanged(
     RenderWidgetHostViewBase* view,
     const gfx::Range& range,
     const std::vector<gfx::Rect>& character_bounds) {
   DCHECK(IsRegistered(view));
   composition_range_info_map_[view].character_bounds.clear();
 
   // The values for the bounds should be converted to root view's coordinates
   // before being stored.
   for (auto rect : character_bounds) {
     composition_range_info_map_[view].character_bounds.emplace_back(gfx::Rect(
         view->TransformPointToRootCoordSpace(rect.origin()), rect.size()));
   }
 
   composition_range_info_map_[view].range.set_start(range.start());
   composition_range_info_map_[view].range.set_end(range.end());
 
-  FOR_EACH_OBSERVER(Observer, observer_list_,
-                    OnImeCompositionRangeChanged(this, view));
+  for (auto& observer : observer_list_)
+    observer.OnImeCompositionRangeChanged(this, view);
 }
 
 void TextInputManager::SelectionChanged(RenderWidgetHostViewBase* view,
                                         const base::string16& text,
                                         size_t offset,
                                         const gfx::Range& range) {
   DCHECK(IsRegistered(view));
 
   text_selection_map_[view].text = text;
   text_selection_map_[view].offset = offset;
   text_selection_map_[view].range.set_start(range.start());
   text_selection_map_[view].range.set_end(range.end());
 
-  FOR_EACH_OBSERVER(Observer, observer_list_,
-                    OnTextSelectionChanged(this, view));
+  for (auto& observer : observer_list_)
+    observer.OnTextSelectionChanged(this, view);
 }
 
 void TextInputManager::Register(RenderWidgetHostViewBase* view) {
   DCHECK(!IsRegistered(view));
 
   text_input_state_map_[view] = TextInputState();
   selection_region_map_[view] = SelectionRegion();
   composition_range_info_map_[view] = CompositionRangeInfo();
   text_selection_map_[view] = TextSelection();
 }
@@ skipping 35 matching lines @@
 
 ui::TextInputType TextInputManager::GetTextInputTypeForViewForTesting(
     RenderWidgetHostViewBase* view) {
   DCHECK(IsRegistered(view));
   return text_input_state_map_[view].type;
 }
 
 void TextInputManager::NotifyObserversAboutInputStateUpdate(
     RenderWidgetHostViewBase* updated_view,
     bool did_update_state) {
-  FOR_EACH_OBSERVER(
-      Observer, observer_list_,
-      OnUpdateTextInputStateCalled(this, updated_view, did_update_state));
+  for (auto& observer : observer_list_)
+    observer.OnUpdateTextInputStateCalled(this, updated_view, did_update_state);
 }
 
 TextInputManager::SelectionRegion::SelectionRegion() {}
 
 TextInputManager::SelectionRegion::SelectionRegion(
     const SelectionRegion& other) = default;
 
 TextInputManager::CompositionRangeInfo::CompositionRangeInfo() {}
 
 TextInputManager::CompositionRangeInfo::CompositionRangeInfo(
@@ skipping 27 matching lines @@
                     "point exceeds text length).";
     return false;
   }
 
   selected_text->clear();
   selected_text->append(text.substr(pos, n));
   return true;
 }
 
 }  // namespace content