components/bookmarks: convert usage of FOR_EACH_OBSERVER macro
ObserverList now supports range-based for loops and thus this can be
used to iterate through a list of observers as the FOR_EACH_OBSERVER
macro was deprecated.
This patch was generated by the following command line:
$ cd components/bookmarks
$ perl -0777 -pi -e
's/FOR_EACH_OBSERVER\(\s*([\w:]+?)\s*,\s*([\w:()]+?)\s*,\s*([^;]+?)\);/for
(\1& observer : \2) observer.\3;/mg' $(git gs FOR_EACH_OBSERVER | cut -d: -f1 | uniq)
And then manually inspected for line indentation fixes.
BUG=655021
TEST=components_unittests
[email protected]
Review-Url: https://chromiumcodereview.appspot.com/2425603005
Cr-Commit-Position: refs/heads/master@{#426113}
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index d2433bd..a399809 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -129,8 +129,8 @@
}
BookmarkModel::~BookmarkModel() {
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkModelBeingDeleted(this));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkModelBeingDeleted(this);
if (store_.get()) {
// The store maintains a reference back to us. We need to tell it we're gone
@@ -178,8 +178,8 @@
void BookmarkModel::BeginExtensiveChanges() {
if (++extensive_changes_ == 1) {
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- ExtensiveBookmarkChangesBeginning(this));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.ExtensiveBookmarkChangesBeginning(this);
}
}
@@ -187,19 +187,19 @@
--extensive_changes_;
DCHECK_GE(extensive_changes_, 0);
if (extensive_changes_ == 0) {
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- ExtensiveBookmarkChangesEnded(this));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.ExtensiveBookmarkChangesEnded(this);
}
}
void BookmarkModel::BeginGroupedChanges() {
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- GroupedBookmarkChangesBeginning(this));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.GroupedBookmarkChangesBeginning(this);
}
void BookmarkModel::EndGroupedChanges() {
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- GroupedBookmarkChangesEnded(this));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.GroupedBookmarkChangesEnded(this);
}
void BookmarkModel::Remove(const BookmarkNode* node) {
@@ -218,8 +218,8 @@
};
std::vector<RemoveNodeData> removed_node_data_list;
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- OnWillRemoveAllUserBookmarks(this));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.OnWillRemoveAllUserBookmarks(this);
BeginExtensiveChanges();
// Skip deleting permanent nodes. Permanent bookmark nodes are the root and
@@ -244,8 +244,8 @@
if (store_.get())
store_->ScheduleSave();
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkAllUserNodesRemoved(this, removed_urls));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkAllUserNodesRemoved(this, removed_urls);
BeginGroupedChanges();
for (auto& removed_node_data : removed_node_data_list) {
@@ -294,9 +294,8 @@
if (store_.get())
store_->ScheduleSave();
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkNodeMoved(this, old_parent, old_index,
- new_parent, index));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkNodeMoved(this, old_parent, old_index, new_parent, index);
}
void BookmarkModel::Copy(const BookmarkNode* node,
@@ -352,8 +351,8 @@
return;
}
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- OnWillChangeBookmarkNode(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.OnWillChangeBookmarkNode(this, node);
// The title index doesn't support changing the title, instead we remove then
// add it back.
@@ -364,8 +363,8 @@
if (store_.get())
store_->ScheduleSave();
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkNodeChanged(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkNodeChanged(this, node);
}
void BookmarkModel::SetURL(const BookmarkNode* node, const GURL& url) {
@@ -378,8 +377,8 @@
mutable_node->InvalidateFavicon();
CancelPendingFaviconLoadRequests(mutable_node);
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- OnWillChangeBookmarkNode(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.OnWillChangeBookmarkNode(this, node);
{
base::AutoLock url_lock(url_lock_);
@@ -391,8 +390,8 @@
if (store_.get())
store_->ScheduleSave();
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkNodeChanged(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkNodeChanged(this, node);
}
void BookmarkModel::SetNodeMetaInfo(const BookmarkNode* node,
@@ -402,14 +401,14 @@
if (node->GetMetaInfo(key, &old_value) && old_value == value)
return;
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- OnWillChangeBookmarkMetaInfo(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.OnWillChangeBookmarkMetaInfo(this, node);
if (AsMutable(node)->SetMetaInfo(key, value) && store_.get())
store_->ScheduleSave();
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkMetaInfoChanged(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkMetaInfoChanged(this, node);
}
void BookmarkModel::SetNodeMetaInfoMap(
@@ -420,15 +419,15 @@
(old_meta_info_map && meta_info_map == *old_meta_info_map))
return;
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- OnWillChangeBookmarkMetaInfo(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.OnWillChangeBookmarkMetaInfo(this, node);
AsMutable(node)->SetMetaInfoMap(meta_info_map);
if (store_.get())
store_->ScheduleSave();
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkMetaInfoChanged(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkMetaInfoChanged(this, node);
}
void BookmarkModel::DeleteNodeMetaInfo(const BookmarkNode* node,
@@ -437,14 +436,14 @@
if (!meta_info_map || meta_info_map->find(key) == meta_info_map->end())
return;
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- OnWillChangeBookmarkMetaInfo(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.OnWillChangeBookmarkMetaInfo(this, node);
if (AsMutable(node)->DeleteMetaInfo(key) && store_.get())
store_->ScheduleSave();
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkMetaInfoChanged(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkMetaInfoChanged(this, node);
}
void BookmarkModel::AddNonClonedKey(const std::string& key) {
@@ -492,9 +491,8 @@
BookmarkNode* mutable_node = AsMutable(node);
mutable_node->InvalidateFavicon();
CancelPendingFaviconLoadRequests(mutable_node);
- FOR_EACH_OBSERVER(BookmarkModelObserver,
- observers_,
- BookmarkNodeFaviconChanged(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkNodeFaviconChanged(this, node);
}
}
@@ -650,8 +648,8 @@
return;
}
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- OnWillReorderBookmarkNode(this, parent));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.OnWillReorderBookmarkNode(this, parent);
UErrorCode error = U_ZERO_ERROR;
std::unique_ptr<icu::Collator> collator(icu::Collator::createInstance(error));
@@ -665,8 +663,8 @@
if (store_.get())
store_->ScheduleSave();
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkNodeChildrenReordered(this, parent));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkNodeChildrenReordered(this, parent);
}
void BookmarkModel::ReorderChildren(
@@ -679,8 +677,8 @@
for (const BookmarkNode* node : ordered_nodes)
DCHECK_EQ(parent, node->parent());
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- OnWillReorderBookmarkNode(this, parent));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.OnWillReorderBookmarkNode(this, parent);
if (ordered_nodes.size() > 1) {
std::map<const BookmarkNode*, int> order;
@@ -700,8 +698,8 @@
store_->ScheduleSave();
}
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkNodeChildrenReordered(this, parent));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkNodeChildrenReordered(this, parent);
}
void BookmarkModel::SetDateFolderModified(const BookmarkNode* parent,
@@ -774,8 +772,8 @@
void BookmarkModel::NotifyNodeAddedForAllDescendents(const BookmarkNode* node) {
for (int i = 0; i < node->child_count(); ++i) {
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkNodeAdded(this, node, i));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkNodeAdded(this, node, i);
NotifyNodeAddedForAllDescendents(node->GetChild(i));
}
}
@@ -900,8 +898,8 @@
FROM_HERE_WITH_EXPLICIT_FUNCTION("467179 BookmarkModel::DoneLoading6"));
// Notify our direct observers.
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkModelLoaded(this, details->ids_reassigned()));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkModelLoaded(this, details->ids_reassigned());
}
void BookmarkModel::RemoveAndDeleteNode(BookmarkNode* node_ptr) {
@@ -912,8 +910,8 @@
int index = parent->GetIndexOf(node_ptr);
DCHECK_NE(-1, index);
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- OnWillRemoveBookmarks(this, parent, index, node_ptr));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.OnWillRemoveBookmarks(this, parent, index, node_ptr);
std::set<GURL> removed_urls;
{
@@ -924,10 +922,8 @@
if (store_.get())
store_->ScheduleSave();
- FOR_EACH_OBSERVER(
- BookmarkModelObserver,
- observers_,
- BookmarkNodeRemoved(this, parent, index, node.get(), removed_urls));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkNodeRemoved(this, parent, index, node.get(), removed_urls);
undo_delegate()->OnBookmarkNodeRemoved(this, parent, index, std::move(node));
}
@@ -989,8 +985,8 @@
AddNodeToInternalMaps(node_ptr);
}
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkNodeAdded(this, parent, index));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkNodeAdded(this, parent, index);
return node_ptr;
}
@@ -1084,8 +1080,8 @@
}
void BookmarkModel::FaviconLoaded(const BookmarkNode* node) {
- FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
- BookmarkNodeFaviconChanged(this, node));
+ for (BookmarkModelObserver& observer : observers_)
+ observer.BookmarkNodeFaviconChanged(this, node);
}
void BookmarkModel::CancelPendingFaviconLoadRequests(BookmarkNode* node) {
