Index: content/browser/frame_host/frame_tree.cc |
diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc |
index c3f130125c73748b721e94018d4acd2cce0c0426..702f225d93617a7666da3cd2f254c4ac7e7c4317 100644 |
--- a/content/browser/frame_host/frame_tree.cc |
+++ b/content/browser/frame_host/frame_tree.cc |
@@ -83,47 +83,6 @@ FrameTree::NodeRange::NodeRange(FrameTreeNode* root, |
FrameTreeNode* node_to_skip) |
: root_(root), node_to_skip_(node_to_skip) {} |
-FrameTree::ConstNodeIterator::ConstNodeIterator( |
- const ConstNodeIterator& other) = default; |
- |
-FrameTree::ConstNodeIterator::~ConstNodeIterator() {} |
- |
-FrameTree::ConstNodeIterator& FrameTree::ConstNodeIterator::operator++() { |
- for (size_t i = 0; i < current_node_->child_count(); ++i) { |
- const FrameTreeNode* child = current_node_->child_at(i); |
- queue_.push(child); |
- } |
- |
- if (!queue_.empty()) { |
- current_node_ = queue_.front(); |
- queue_.pop(); |
- } else { |
- current_node_ = nullptr; |
- } |
- |
- return *this; |
-} |
- |
-bool FrameTree::ConstNodeIterator::operator==( |
- const ConstNodeIterator& rhs) const { |
- return current_node_ == rhs.current_node_; |
-} |
- |
-FrameTree::ConstNodeIterator::ConstNodeIterator( |
- const FrameTreeNode* starting_node) |
- : current_node_(starting_node) {} |
- |
-FrameTree::ConstNodeIterator FrameTree::ConstNodeRange::begin() { |
- return ConstNodeIterator(root_); |
-} |
- |
-FrameTree::ConstNodeIterator FrameTree::ConstNodeRange::end() { |
- return ConstNodeIterator(nullptr); |
-} |
- |
-FrameTree::ConstNodeRange::ConstNodeRange(const FrameTreeNode* root) |
- : root_(root) {} |
- |
FrameTree::FrameTree(Navigator* navigator, |
RenderFrameHostDelegate* render_frame_delegate, |
RenderViewHostDelegate* render_view_delegate, |
@@ -205,10 +164,6 @@ FrameTree::NodeRange FrameTree::NodesExcept(FrameTreeNode* node_to_skip) { |
return NodeRange(root_, node_to_skip); |
} |
-FrameTree::ConstNodeRange FrameTree::ConstNodes() const { |
- return ConstNodeRange(root_); |
-} |
- |
bool FrameTree::AddFrame( |
FrameTreeNode* parent, |
int process_id, |
@@ -478,7 +433,7 @@ void FrameTree::ResetLoadProgress() { |
} |
bool FrameTree::IsLoading() const { |
- for (const FrameTreeNode* node : ConstNodes()) { |
+ for (const FrameTreeNode* node : const_cast<FrameTree*>(this)->Nodes()) { |
if (node->IsLoading()) |
return true; |
} |