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

Fix C++ style

Browse source
This commit is contained in:
Ryohei Ikegami 2017-03-19 18:24:05 +09:00
parent 076427673e
commit f3ce93f1bb
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/atom_browser_client.cc
View file

@ -96,7 +96,8 @@ bool AtomBrowserClient::ShouldCreateNewSiteInstance(
return false; return false;
int process_id = current_instance->GetProcess()->GetID(); int process_id = current_instance->GetProcess()->GetID();
if (!(IsRendererSandboxed(process_id) || RendererUsesNativeWindowOpen(process_id))) if (!(IsRendererSandboxed(process_id)
|| RendererUsesNativeWindowOpen(process_id)))
// non-sandboxed renderers should always create a new SiteInstance // non-sandboxed renderers should always create a new SiteInstance
return true; return true;
@ -110,7 +111,8 @@ bool AtomBrowserClient::ShouldCreateNewSiteInstance(
content::SiteInstance::GetSiteForURL(browser_context, url) != src_url; content::SiteInstance::GetSiteForURL(browser_context, url) != src_url;
} }
void AtomBrowserClient::AddProcessPreferences(int process_id, AtomBrowserClient::ProcessPreferences prefs) { void AtomBrowserClient::AddProcessPreferences(
int process_id, AtomBrowserClient::ProcessPreferences prefs) {
base::AutoLock auto_lock(process_preferences_lock_); base::AutoLock auto_lock(process_preferences_lock_);
process_preferences_[process_id] = prefs; process_preferences_[process_id] = prefs;
} }
@ -143,7 +145,8 @@ void AtomBrowserClient::RenderProcessWillLaunch(
content::WebContents* web_contents = GetWebContentsFromProcessID(process_id); content::WebContents* web_contents = GetWebContentsFromProcessID(process_id);
ProcessPreferences process_prefs; ProcessPreferences process_prefs;
process_prefs.sandbox = WebContentsPreferences::IsSandboxed(web_contents); process_prefs.sandbox = WebContentsPreferences::IsSandboxed(web_contents);
process_prefs.native_window_open = WebContentsPreferences::UsesNativeWindowOpen(web_contents); process_prefs.native_window_open
= WebContentsPreferences::UsesNativeWindowOpen(web_contents);
AddProcessPreferences(host->GetID(), process_prefs); AddProcessPreferences(host->GetID(), process_prefs);
// ensure the ProcessPreferences is removed later // ensure the ProcessPreferences is removed later
host->AddObserver(this); host->AddObserver(this);
@ -319,7 +322,8 @@ bool AtomBrowserClient::CanCreateWindow(
bool* no_javascript_access) { bool* no_javascript_access) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO); DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
if (IsRendererSandboxed(render_process_id) || RendererUsesNativeWindowOpen(render_process_id)) { if (IsRendererSandboxed(render_process_id)
|| RendererUsesNativeWindowOpen(render_process_id)) {
*no_javascript_access = false; *no_javascript_access = false;
return true; return true;
} }

3
atom/browser/web_contents_preferences.cc
View file

@ -210,7 +210,8 @@ bool WebContentsPreferences::IsSandboxed(content::WebContents* web_contents) {
return sandboxed; return sandboxed;
} }
bool WebContentsPreferences::UsesNativeWindowOpen(content::WebContents* web_contents) { bool WebContentsPreferences::UsesNativeWindowOpen(
content::WebContents* web_contents) {
WebContentsPreferences* self; WebContentsPreferences* self;
if (!web_contents) if (!web_contents)
return false; return false;