Remove usage of FOR_EACH_OBSERVER macro in blimp

Observer lists now support range-based for loops. BUG=655021 Review-Url: https://codereview.chromium.org/2425493002 Cr-Commit-Position: refs/heads/master@{#425768}
marcosholgado · Oct 17, 2016 · 08199f1 · 08199f1
1 parent 7c5d5c0
commit 08199f1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/blimp/client/core/contents/blimp_contents_impl.cc b/blimp/client/core/contents/blimp_contents_impl.cc
@@ -45,7 +45,8 @@ BlimpContentsImpl::BlimpContentsImpl(
 }
 
 BlimpContentsImpl::~BlimpContentsImpl() {
-  FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, BlimpContentsDying());
+  for (auto& observer : observers_)
+    observer.BlimpContentsDying();
   ime_feature_->set_delegate(nullptr);
 }
 
@@ -103,18 +104,18 @@ bool BlimpContentsImpl::HasObserver(BlimpContentsObserver* observer) {
 }
 
 void BlimpContentsImpl::OnNavigationStateChanged() {
-  FOR_EACH_OBSERVER(BlimpContentsObserver, observers_,
-                    OnNavigationStateChanged());
+  for (auto& observer : observers_)
+    observer.OnNavigationStateChanged();
 }
 
 void BlimpContentsImpl::OnLoadingStateChanged(bool loading) {
-  FOR_EACH_OBSERVER(BlimpContentsObserver, observers_,
-                    OnLoadingStateChanged(loading));
+  for (auto& observer : observers_)
+    observer.OnLoadingStateChanged(loading);
 }
 
 void BlimpContentsImpl::OnPageLoadingStateChanged(bool loading) {
-  FOR_EACH_OBSERVER(BlimpContentsObserver, observers_,
-                    OnPageLoadingStateChanged(loading));
+  for (auto& observer : observers_)
+    observer.OnPageLoadingStateChanged(loading);
 }
 
 void BlimpContentsImpl::SetSizeAndScale(const gfx::Size& size,

diff --git a/blimp/client/core/session/connection_status.cc b/blimp/client/core/session/connection_status.cc
@@ -36,14 +36,15 @@ base::WeakPtr<ConnectionStatus> ConnectionStatus::GetWeakPtr() {
 void ConnectionStatus::OnConnected() {
   is_connected_ = true;
   UMA_HISTOGRAM_BOOLEAN("Blimp.Connected", true);
-  FOR_EACH_OBSERVER(NetworkEventObserver, connection_observers_, OnConnected());
+  for (auto& observer : connection_observers_)
+    observer.OnConnected();
 }
 
 void ConnectionStatus::OnDisconnected(int result) {
   is_connected_ = false;
   UMA_HISTOGRAM_BOOLEAN("Blimp.Connected", false);
-  FOR_EACH_OBSERVER(NetworkEventObserver, connection_observers_,
-                    OnDisconnected(result));
+  for (auto& observer : connection_observers_)
+    observer.OnDisconnected(result);
 }
 
 }  // namespace client

diff --git a/blimp/engine/app/settings_manager.cc b/blimp/engine/app/settings_manager.cc
@@ -43,7 +43,8 @@ void SettingsManager::UpdateEngineSettings(const EngineSettings& settings) {
 
   if (settings_.record_whole_document != old_settings.record_whole_document) {
     // Notify the observers that the web preferences have changed.
-    FOR_EACH_OBSERVER(Observer, observer_list_, OnWebPreferencesChanged());
+    for (auto& observer : observer_list_)
+      observer.OnWebPreferencesChanged();
   }
 }
 

diff --git a/blimp/engine/app/ui/blimp_screen.cc b/blimp/engine/app/ui/blimp_screen.cc
@@ -39,8 +39,8 @@ void BlimpScreen::UpdateDisplayScaleAndSize(float scale,
 
   display_.SetScaleAndBounds(scale, gfx::Rect(size));
 
-  FOR_EACH_OBSERVER(display::DisplayObserver, observers_,
-                    OnDisplayMetricsChanged(display_, metrics));
+  for (auto& observer : observers_)
+    observer.OnDisplayMetricsChanged(display_, metrics);
 }
 
 gfx::Point BlimpScreen::GetCursorScreenPoint() {

diff --git a/blimp/net/blimp_connection.cc b/blimp/net/blimp_connection.cc
@@ -192,8 +192,8 @@ void BlimpConnection::OnConnectionError(int error) {
   VLOG(1) << "OnConnectionError, error=" << error;
 
   // Propagate the error to all observers.
-  FOR_EACH_OBSERVER(ConnectionErrorObserver, error_observers_,
-                    OnConnectionError(error));
+  for (auto& observer : error_observers_)
+    observer.OnConnectionError(error);
 }
 
 }  // namespace blimp