bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-15 19:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1358 changes:

Browse Source 
- Mac: Don't call OverrideChildProcessPath in child processes (issue #806).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1547@1359 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-08-14 16:37:21 +00:00
parent fd47a510f0
commit bee35bc8e6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/common/main_delegate.cc
View File

@ -335,11 +335,15 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
}
void CefMainDelegate::PreSandboxStartup() {
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
#if defined(OS_MACOSX)
OverrideChildProcessPath();
if (!command_line.HasSwitch(switches::kProcessType)) {
// Only override the child process path when executing the main process.
OverrideChildProcessPath();
}
#endif
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kDisablePackLoading))
content_client_.set_pack_loading_disabled(true);