Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: chrome/app/chrome_dll_main.cc

Issue 28347: Don't expose --single-process and --in-process-plugins for official Chrome re... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // TODO(port): the ifdefs in here are a first step towards trying to determine 5 // TODO(port): the ifdefs in here are a first step towards trying to determine
6 // the correct abstraction for all the OS functionality required at this 6 // the correct abstraction for all the OS functionality required at this
7 // stage of process initialization. It should not be taken as a final 7 // stage of process initialization. It should not be taken as a final
8 // abstraction. 8 // abstraction.
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 _Module.Init(NULL, instance); 311 _Module.Init(NULL, instance);
312 #endif 312 #endif
313 313
314 // Notice a user data directory override if any 314 // Notice a user data directory override if any
315 const std::wstring user_data_dir = 315 const std::wstring user_data_dir =
316 parsed_command_line.GetSwitchValue(switches::kUserDataDir); 316 parsed_command_line.GetSwitchValue(switches::kUserDataDir);
317 if (!user_data_dir.empty()) 317 if (!user_data_dir.empty())
318 PathService::Override(chrome::DIR_USER_DATA, user_data_dir); 318 PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
319 319
320 bool single_process = 320 bool single_process =
321 #if defined (GOOGLE_CHROME_BUILD)
322 false;
323 #else
321 parsed_command_line.HasSwitch(switches::kSingleProcess); 324 parsed_command_line.HasSwitch(switches::kSingleProcess);
325 #endif
322 if (single_process) 326 if (single_process)
323 RenderProcessHost::set_run_renderer_in_process(true); 327 RenderProcessHost::set_run_renderer_in_process(true);
324 #if defined(OS_MACOSX) 328 #if defined(OS_MACOSX)
325 // TODO(port-mac): This is from renderer_main_platform_delegate.cc. 329 // TODO(port-mac): This is from renderer_main_platform_delegate.cc.
326 // shess tried to refactor things appropriately, but it sprawled out 330 // shess tried to refactor things appropriately, but it sprawled out
327 // of control because different platforms needed different styles of 331 // of control because different platforms needed different styles of
328 // initialization. Try again once we understand the process 332 // initialization. Try again once we understand the process
329 // architecture needed and where it should live. 333 // architecture needed and where it should live.
330 if (single_process) 334 if (single_process)
331 InitWebCoreSystemInterface(); 335 InitWebCoreSystemInterface();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 388
385 _Module.Term(); 389 _Module.Term();
386 #endif 390 #endif
387 391
388 logging::CleanupChromeLogging(); 392 logging::CleanupChromeLogging();
389 393
390 return rv; 394 return rv;
391 } 395 }
392 396
393 397
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698