diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-20 07:15:17 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-20 07:15:17 +0000 |
| commit | ea51de3307a6a5947ca047fa9d0e20359fdcf658 (patch) | |
| tree | c1a49c1d41c4bfbf74ddbc28c371f840dd2848fa /chrome/renderer/renderer_main.cc | |
| parent | b6aedfff89cd93f07c1c38a13062801e81bf26e4 (diff) | |
| download | chromium_src-ea51de3307a6a5947ca047fa9d0e20359fdcf658.zip chromium_src-ea51de3307a6a5947ca047fa9d0e20359fdcf658.tar.gz chromium_src-ea51de3307a6a5947ca047fa9d0e20359fdcf658.tar.bz2 | |
Reverting 10080.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_main.cc')
| -rw-r--r-- | chrome/renderer/renderer_main.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc index 8ca5346..c376486 100644 --- a/chrome/renderer/renderer_main.cc +++ b/chrome/renderer/renderer_main.cc @@ -90,8 +90,9 @@ int RendererMain(const MainFunctionParams& parameters) { HandleRendererErrorTestParameters(parsed_command_line); - { - RenderProcess render_process; + std::wstring channel_name = + parsed_command_line.GetSwitchValue(switches::kProcessChannelID); + if (RenderProcess::GlobalInit(channel_name)) { bool run_loop = true; if (!no_sandbox) { run_loop = platform.EnableSandbox(); @@ -107,6 +108,8 @@ int RendererMain(const MainFunctionParams& parameters) { if (pool) pool->Recycle(); MessageLoop::current()->Run(); } + + RenderProcess::GlobalCleanup(); } platform.PlatformUninitialize(); return 0; |