mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #267 from electron/update-ownership

Browse source 
Update std:move call to fix macOS compiler error
This commit is contained in:
Kevin Sawicki 2017-01-13 09:13:25 -08:00 committed by GitHub
commit 2443ea4055
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -279,8 +279,7 @@ void InspectableWebContentsImpl::ShowDevTools() {
Observe(devtools_web_contents_.get()); Observe(devtools_web_contents_.get());
devtools_web_contents_->SetDelegate(this); devtools_web_contents_->SetDelegate(this);
AttachTo(std::move( AttachTo(content::DevToolsAgentHost::GetOrCreateFor(web_contents_.get()));
content::DevToolsAgentHost::GetOrCreateFor(web_contents_.get())));
devtools_web_contents_->GetController().LoadURL( devtools_web_contents_->GetController().LoadURL(
GetDevToolsURL(can_dock_), GetDevToolsURL(can_dock_),
@ -308,7 +307,7 @@ void InspectableWebContentsImpl::AttachTo(
scoped_refptr<content::DevToolsAgentHost> host) { scoped_refptr<content::DevToolsAgentHost> host) {
if (agent_host_.get()) if (agent_host_.get())
Detach(); Detach();
agent_host_ = host; agent_host_ = std::move(host);
// Terminate existing debugging connections and start debugging. // Terminate existing debugging connections and start debugging.
agent_host_->ForceAttachClient(this); agent_host_->ForceAttachClient(this);
} }