summaryrefslogtreecommitdiffstats
path: root/chrome/browser/zygote_main_linux.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 22:50:39 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 22:50:39 +0000
commit0189bbd4cc569eaec4c6664109659c32fed8e4b7 (patch)
treef792f823d15a1e806d1b25d0f6d318622db6daf4 /chrome/browser/zygote_main_linux.cc
parent079487b08bf7867eb7c078b59dec61f142a42df2 (diff)
downloadchromium_src-0189bbd4cc569eaec4c6664109659c32fed8e4b7.zip
chromium_src-0189bbd4cc569eaec4c6664109659c32fed8e4b7.tar.gz
chromium_src-0189bbd4cc569eaec4c6664109659c32fed8e4b7.tar.bz2
CommandLine: rejigger how initialization works.
I'm attempting to clean up CommandLine. This change rearranges how initialization is done. I am trying to eliminate redundant functions; more will come in subsequent changes. Review URL: http://codereview.chromium.org/273018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/zygote_main_linux.cc')
-rw-r--r--chrome/browser/zygote_main_linux.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc
index eb0ef42..ecf7291 100644
--- a/chrome/browser/zygote_main_linux.cc
+++ b/chrome/browser/zygote_main_linux.cc
@@ -193,8 +193,11 @@ class Zygote {
if (!child) {
close(3); // our socket from the browser is in fd 3
Singleton<base::GlobalDescriptors>()->Reset(mapping);
+
+ // Reset the process-wide command line to our new command line.
CommandLine::Reset();
- CommandLine::Init(args);
+ CommandLine::Init(0, NULL);
+ CommandLine::ForCurrentProcess()->InitFromArgv(args);
CommandLine::SetProcTitle();
return true;
}