Remove usage of FOR_EACH_OBSERVER macro in ui/app_list

ui/app_list/app_list_item_list.cc

 // Copyright (c) 2013 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 "ui/app_list/app_list_item_list.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/app_list/app_list_item.h"
 
 namespace app_list {
@@ skipping 66 matching lines @@
   }
   target_item->set_position(new_position);
 
   DVLOG(2) << "Move: "
            << " Prev: " << (prev ? prev->position().ToDebugString() : "(none)")
            << " Next: " << (next ? next->position().ToDebugString() : "(none)")
            << " -> " << new_position.ToDebugString();
 
   // Insert the item and notify observers.
   app_list_items_.insert(app_list_items_.begin() + to_index, target_item);
-  FOR_EACH_OBSERVER(AppListItemListObserver,
-                    observers_,
-                    OnListItemMoved(from_index, to_index, target_item));
+  for (auto& observer : observers_)
+    observer.OnListItemMoved(from_index, to_index, target_item);
 }
 
 void AppListItemList::SetItemPosition(AppListItem* item,
                                       syncer::StringOrdinal new_position) {
   DCHECK(item);
   size_t from_index;
   if (!FindItemIndex(item->id(), &from_index)) {
     LOG(ERROR) << "SetItemPosition: Not in list: " << item->id().substr(0, 8);
     return;
   }
@@ skipping 13 matching lines @@
     return;
   }
   // Remove the item and get the updated to index.
   app_list_items_.weak_erase(app_list_items_.begin() + from_index);
   to_index = GetItemSortOrderIndex(new_position, item->id());
   DVLOG(2) << "SetItemPosition: " << item->id().substr(0, 8) << " -> "
            << new_position.ToDebugString() << " From: " << from_index
            << " To: " << to_index;
   item->set_position(new_position);
   app_list_items_.insert(app_list_items_.begin() + to_index, item);
-  FOR_EACH_OBSERVER(AppListItemListObserver,
-                    observers_,
-                    OnListItemMoved(from_index, to_index, item));
+  for (auto& observer : observers_)
+    observer.OnListItemMoved(from_index, to_index, item);
 }
 
 void AppListItemList::HighlightItemInstalledFromUI(const std::string& id) {
   // Items within folders are not highlighted (apps are never installed to a
   // folder initially). So just search the top-level list.
   size_t index;
   if (FindItemIndex(highlighted_id_, &index)) {
     item_at(index)->set_highlighted(false);
-    FOR_EACH_OBSERVER(AppListItemListObserver,
-                      observers_,
-                      OnAppListItemHighlight(index, false));
+    for (auto& observer : observers_)
+      observer.OnAppListItemHighlight(index, false);
   }
   highlighted_id_ = id;
   if (!FindItemIndex(highlighted_id_, &index)) {
     // If the item isin't in the app list yet, it will be highlighted later, in
     // AddItem().
     return;
   }
 
   item_at(index)->set_highlighted(true);
-  FOR_EACH_OBSERVER(
-      AppListItemListObserver, observers_, OnAppListItemHighlight(index, true));
+  for (auto& observer : observers_)
+    observer.OnAppListItemHighlight(index, true);
 }
 
 // AppListItemList private
 
 syncer::StringOrdinal AppListItemList::CreatePositionBefore(
     const syncer::StringOrdinal& position) {
   if (app_list_items_.empty())
     return syncer::StringOrdinal::CreateInitialOrdinal();
 
   size_t nitems = app_list_items_.size();
@@ skipping 14 matching lines @@
       app_list_items_[index]->position());
 }
 
 AppListItem* AppListItemList::AddItem(std::unique_ptr<AppListItem> item_ptr) {
   AppListItem* item = item_ptr.get();
   CHECK(std::find(app_list_items_.begin(), app_list_items_.end(), item)
         == app_list_items_.end());
   EnsureValidItemPosition(item);
   size_t index = GetItemSortOrderIndex(item->position(), item->id());
   app_list_items_.insert(app_list_items_.begin() + index, item_ptr.release());
-  FOR_EACH_OBSERVER(AppListItemListObserver,
-                    observers_,
-                    OnListItemAdded(index, item));
+  for (auto& observer : observers_)
+    observer.OnListItemAdded(index, item);
 
   if (item->id() == highlighted_id_) {
     // Item not present when highlight requested, so highlight it now.
     item->set_highlighted(true);
-    FOR_EACH_OBSERVER(AppListItemListObserver,
-                      observers_,
-                      OnAppListItemHighlight(index, true));
+    for (auto& observer : observers_)
+      observer.OnAppListItemHighlight(index, true);
   }
   return item;
 }
 
 void AppListItemList::DeleteItem(const std::string& id) {
   std::unique_ptr<AppListItem> item = RemoveItem(id);
   // |item| will be deleted on destruction.
 }
 
 std::unique_ptr<AppListItem> AppListItemList::RemoveItem(
     const std::string& id) {
   size_t index;
   if (!FindItemIndex(id, &index))
     LOG(FATAL) << "RemoveItem: Not found: " << id;
   return RemoveItemAt(index);
 }
 
 std::unique_ptr<AppListItem> AppListItemList::RemoveItemAt(size_t index) {
   CHECK_LT(index, item_count());
   AppListItem* item = app_list_items_[index];
   app_list_items_.weak_erase(app_list_items_.begin() + index);
-  FOR_EACH_OBSERVER(AppListItemListObserver,
-                    observers_,
-                    OnListItemRemoved(index, item));
+  for (auto& observer : observers_)
+    observer.OnListItemRemoved(index, item);
   return base::WrapUnique<AppListItem>(item);
 }
 
 void AppListItemList::DeleteItemAt(size_t index) {
   std::unique_ptr<AppListItem> item = RemoveItemAt(index);
   // |item| will be deleted on destruction.
 }
 
 void AppListItemList::EnsureValidItemPosition(AppListItem* item) {
   syncer::StringOrdinal position = item->position();
@@ skipping 37 matching lines @@
   }
   AppListItem* last = last_index < nitems ? app_list_items_[last_index] : NULL;
   for (size_t i = index; i < last_index; ++i) {
     AppListItem* cur = app_list_items_[i];
     if (last)
       cur->set_position(prev->position().CreateBetween(last->position()));
     else
       cur->set_position(prev->position().CreateAfter());
     prev = cur;
   }
-  FOR_EACH_OBSERVER(AppListItemListObserver,
-                    observers_,
-                    OnListItemMoved(index, index, app_list_items_[index]));
+  for (auto& observer : observers_)
+    observer.OnListItemMoved(index, index, app_list_items_[index]);
 }
 
 }  // namespace app_list