Commit b4f3ef20 authored by Olivier Yiptong's avatar Olivier Yiptong Committed by Commit Bot

[Code Health] Convert TreeNodeIterator from base::Bind/base::Callback

base::Bind/base::Callback are deprecated in favor of either
base::BindOnce/base::OnceCallback or base::BindRepeating/
base::RepeatingCallback (depending on whether the callback
is invoked once or multiple time).

Convert all uses of base::Bind/base::Callback in ui/base
to the recommended methods/types.

Bug: 1007847
Change-Id: Idda7c3a5eb98c4d9a819f24b6208c2f1aa642a27
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1830293
Auto-Submit: Olivier Yiptong <oyiptong@chromium.org>
Reviewed-by: default avatarccameron <ccameron@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702305}
parent 428581b3
...@@ -22,7 +22,7 @@ namespace ui { ...@@ -22,7 +22,7 @@ namespace ui {
template <class NodeType> template <class NodeType>
class TreeNodeIterator { class TreeNodeIterator {
public: public:
typedef base::Callback<bool(NodeType*)> PruneCallback; typedef base::RepeatingCallback<bool(NodeType*)> PruneCallback;
// This constructor accepts an optional filter function |prune| which could be // This constructor accepts an optional filter function |prune| which could be
// used to prune complete branches of the tree. The filter function will be // used to prune complete branches of the tree. The filter function will be
......
...@@ -63,12 +63,14 @@ TEST(TreeNodeIteratorTest, Prune) { ...@@ -63,12 +63,14 @@ TEST(TreeNodeIteratorTest, Prune) {
f4->Add(std::make_unique<TestNode>(5), 0); f4->Add(std::make_unique<TestNode>(5), 0);
f3->Add(std::make_unique<TestNode>(7), 1); f3->Add(std::make_unique<TestNode>(7), 1);
TreeNodeIterator<TestNode> odd_iterator(&root, base::Bind(&PruneOdd)); TreeNodeIterator<TestNode> odd_iterator(&root,
base::BindRepeating(&PruneOdd));
ASSERT_TRUE(odd_iterator.has_next()); ASSERT_TRUE(odd_iterator.has_next());
ASSERT_EQ(2, odd_iterator.Next()->value); ASSERT_EQ(2, odd_iterator.Next()->value);
ASSERT_FALSE(odd_iterator.has_next()); ASSERT_FALSE(odd_iterator.has_next());
TreeNodeIterator<TestNode> even_iterator(&root, base::Bind(&PruneEven)); TreeNodeIterator<TestNode> even_iterator(&root,
base::BindRepeating(&PruneEven));
ASSERT_TRUE(even_iterator.has_next()); ASSERT_TRUE(even_iterator.has_next());
ASSERT_EQ(1, even_iterator.Next()->value); ASSERT_EQ(1, even_iterator.Next()->value);
ASSERT_TRUE(even_iterator.has_next()); ASSERT_TRUE(even_iterator.has_next());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment