Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(454)

Unified Diff: content/browser/devtools/render_frame_devtools_agent_host.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/devtools/protocol/system_info_handler.cc ('k') | content/browser/download/base_file.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/devtools/render_frame_devtools_agent_host.cc
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index eb271966dcf49c4b308e9fb04b42a4cb10b071f4..b30463c36ab73845ca150c5bcccd3f813342c2a7 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -4,6 +4,8 @@
#include "content/browser/devtools/render_frame_devtools_agent_host.h"
+#include <utility>
+
#include "base/lazy_instance.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -403,7 +405,7 @@ void RenderFrameDevToolsAgentHost::CommitPending() {
return;
}
- current_ = pending_.Pass();
+ current_ = std::move(pending_);
UpdateProtocolHandlers(current_->host());
current_->Resume();
}
@@ -758,7 +760,7 @@ void RenderFrameDevToolsAgentHost::DisconnectWebContents() {
if (pending_)
DiscardPending();
UpdateProtocolHandlers(nullptr);
- disconnected_ = current_.Pass();
+ disconnected_ = std::move(current_);
disconnected_->Detach();
frame_tree_node_ = nullptr;
in_navigation_protocol_message_buffer_.clear();
@@ -774,7 +776,7 @@ void RenderFrameDevToolsAgentHost::ConnectWebContents(WebContents* wc) {
static_cast<RenderFrameHostImpl*>(wc->GetMainFrame());
DCHECK(host);
frame_tree_node_ = host->frame_tree_node();
- current_ = disconnected_.Pass();
+ current_ = std::move(disconnected_);
SetPending(host);
CommitPending();
WebContentsObserver::Observe(WebContents::FromRenderFrameHost(host));
« no previous file with comments | « content/browser/devtools/protocol/system_info_handler.cc ('k') | content/browser/download/base_file.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698