summaryrefslogtreecommitdiffstats
path: root/content/browser/frame_host/frame_tree_node.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-12-25 22:16:36 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-26 06:17:30 +0000
commit36b6aec9a5f4953e2177146503096ca7de00cc36 (patch)
treea1d68bc1fab0b8127d7f47d3f9b3550eada5ac15 /content/browser/frame_host/frame_tree_node.cc
parent2729e442b1172c5094503a03fe356c8580bb919d (diff)
downloadchromium_src-36b6aec9a5f4953e2177146503096ca7de00cc36.zip
chromium_src-36b6aec9a5f4953e2177146503096ca7de00cc36.tar.gz
chromium_src-36b6aec9a5f4953e2177146503096ca7de00cc36.tar.bz2
Convert Pass()→std::move() in //content/browser
BUG=557422 Review URL: https://codereview.chromium.org/1545243002 Cr-Commit-Position: refs/heads/master@{#366894}
Diffstat (limited to 'content/browser/frame_host/frame_tree_node.cc')
-rw-r--r--content/browser/frame_host/frame_tree_node.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index c61e3fc..b975a05 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -5,6 +5,7 @@
#include "content/browser/frame_host/frame_tree_node.h"
#include <queue>
+#include <utility>
#include "base/macros.h"
#include "base/profiler/scoped_tracker.h"
@@ -152,7 +153,7 @@ FrameTreeNode* FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child,
if (SiteIsolationPolicy::AreCrossProcessFramesPossible())
render_manager_.CreateProxiesForChildFrame(child.get());
- children_.push_back(child.Pass());
+ children_.push_back(std::move(child));
return children_.back().get();
}
@@ -161,7 +162,7 @@ void FrameTreeNode::RemoveChild(FrameTreeNode* child) {
if (iter->get() == child) {
// Subtle: we need to make sure the node is gone from the tree before
// observers are notified of its deletion.
- scoped_ptr<FrameTreeNode> node_to_delete(iter->Pass());
+ scoped_ptr<FrameTreeNode> node_to_delete(std::move(*iter));
children_.erase(iter);
node_to_delete.reset();
return;
@@ -290,7 +291,7 @@ void FrameTreeNode::CreatedNavigationRequest(
DidStartLoading(true);
}
- navigation_request_ = navigation_request.Pass();
+ navigation_request_ = std::move(navigation_request);
render_manager()->DidCreateNavigationRequest(*navigation_request_);
}