Propagate logging command-line parameters to all processes (issue #717).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@774 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-09-10 16:13:51 +00:00
parent 0d086ee6fb
commit e620a6831f

View File

@ -93,21 +93,31 @@ void CefContentBrowserClient::RenderProcessHostCreated(
void CefContentBrowserClient::AppendExtraCommandLineSwitches( void CefContentBrowserClient::AppendExtraCommandLineSwitches(
CommandLine* command_line, int child_process_id) { CommandLine* command_line, int child_process_id) {
std::string process_type = const CommandLine& browser_cmd = *CommandLine::ForCurrentProcess();
command_line->GetSwitchValueASCII(switches::kProcessType);
if (process_type == switches::kRendererProcess) { {
// Propagate the following switches to the renderer command line (along // Propagate the following switches to all command lines (along with any
// with any associated values) if present in the browser command line. // associated values) if present in the browser command line.
static const char* const kSwitchNames[] = { static const char* const kSwitchNames[] = {
switches::kLogFile, switches::kLogFile,
switches::kLogSeverity, switches::kLogSeverity,
};
command_line->CopySwitchesFrom(browser_cmd, kSwitchNames,
arraysize(kSwitchNames));
}
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
if (process_type == switches::kRendererProcess) {
// Propagate the following switches to the renderer command line (along with
// any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {
switches::kProductVersion, switches::kProductVersion,
switches::kLocale, switches::kLocale,
switches::kResourcesDirPath, switches::kResourcesDirPath,
switches::kLocalesDirPath, switches::kLocalesDirPath,
switches::kPackLoadingDisabled, switches::kPackLoadingDisabled,
}; };
const CommandLine& browser_cmd = *CommandLine::ForCurrentProcess();
command_line->CopySwitchesFrom(browser_cmd, kSwitchNames, command_line->CopySwitchesFrom(browser_cmd, kSwitchNames,
arraysize(kSwitchNames)); arraysize(kSwitchNames));
} }