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

Merge remote-tracking branch 'origin/master' into chrome58

Browse source
This commit is contained in:
Kevin Sawicki 2017-05-02 09:15:16 -07:00
commit c6c93211be
25 changed files with 320 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/common_web_contents_delegate.cc
View file

@ -188,8 +188,13 @@ void CommonWebContentsDelegate::SetOwnerWindow(
}
}
void CommonWebContentsDelegate::ResetManagedWebContents() {
web_contents_.reset();
void CommonWebContentsDelegate::ResetManagedWebContents(bool async) {
if (async) {
base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
web_contents_.release());
} else {
web_contents_.reset();
}
}
content::WebContents* CommonWebContentsDelegate::GetWebContents() const {