diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-25 22:16:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 06:17:30 +0000 |
| commit | 36b6aec9a5f4953e2177146503096ca7de00cc36 (patch) | |
| tree | a1d68bc1fab0b8127d7f47d3f9b3550eada5ac15 /content/browser/frame_host/render_frame_proxy_host.cc | |
| parent | 2729e442b1172c5094503a03fe356c8580bb919d (diff) | |
| download | chromium_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/render_frame_proxy_host.cc')
| -rw-r--r-- | content/browser/frame_host/render_frame_proxy_host.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc index ac53e5a..49bcfc9 100644 --- a/content/browser/frame_host/render_frame_proxy_host.cc +++ b/content/browser/frame_host/render_frame_proxy_host.cc @@ -4,6 +4,8 @@ #include "content/browser/frame_host/render_frame_proxy_host.h" +#include <utility> + #include "base/lazy_instance.h" #include "content/browser/bad_message.h" #include "content/browser/frame_host/cross_process_frame_connector.h" @@ -122,13 +124,13 @@ RenderWidgetHostView* RenderFrameProxyHost::GetRenderWidgetHostView() { void RenderFrameProxyHost::TakeFrameHostOwnership( scoped_ptr<RenderFrameHostImpl> render_frame_host) { CHECK(render_frame_host_ == nullptr); - render_frame_host_ = render_frame_host.Pass(); + render_frame_host_ = std::move(render_frame_host); render_frame_host_->set_render_frame_proxy_host(this); } scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { render_frame_host_->set_render_frame_proxy_host(NULL); - return render_frame_host_.Pass(); + return std::move(render_frame_host_); } bool RenderFrameProxyHost::Send(IPC::Message *msg) { |