Skip to content

Commit

Permalink
Use SuppressRendererProcessRestartForOnce
Browse files Browse the repository at this point in the history
  • Loading branch information
seanchas116 committed Mar 20, 2017
1 parent c3c67f7 commit a73f5ab
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions atom/browser/atom_browser_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ bool AtomBrowserClient::ShouldCreateNewSiteInstance(
return false;

int process_id = current_instance->GetProcess()->GetID();
if (!(IsRendererSandboxed(process_id)
|| RendererUsesNativeWindowOpen(process_id)))
if (!IsRendererSandboxed(process_id))
// non-sandboxed renderers should always create a new SiteInstance
return true;

Expand Down Expand Up @@ -322,8 +321,12 @@ bool AtomBrowserClient::CanCreateWindow(
bool* no_javascript_access) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);

if (IsRendererSandboxed(render_process_id)
|| RendererUsesNativeWindowOpen(render_process_id)) {
if (IsRendererSandboxed(render_process_id)) {
*no_javascript_access = false;
return true;
}
if (RendererUsesNativeWindowOpen(render_process_id)) {
SuppressRendererProcessRestartForOnce();
*no_javascript_access = false;
return true;
}
Expand Down

0 comments on commit a73f5ab

Please sign in to comment.