OLD | NEW |
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 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
474 #if defined(OS_WIN) | 474 #if defined(OS_WIN) |
475 sandbox_wrapper.SetServices(sandbox_info); | 475 sandbox_wrapper.SetServices(sandbox_info); |
476 #endif | 476 #endif |
477 sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type); | 477 sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type); |
478 | 478 |
479 #if defined(OS_WIN) | 479 #if defined(OS_WIN) |
480 _Module.Init(NULL, instance); | 480 _Module.Init(NULL, instance); |
481 #endif | 481 #endif |
482 | 482 |
483 // Notice a user data directory override if any | 483 // Notice a user data directory override if any |
484 const std::wstring user_data_dir = | 484 const FilePath user_data_dir = FilePath::FromWStringHack( |
485 parsed_command_line.GetSwitchValue(switches::kUserDataDir); | 485 parsed_command_line.GetSwitchValue(switches::kUserDataDir)); |
486 if (!user_data_dir.empty()) | 486 if (!user_data_dir.empty()) |
487 CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir)); | 487 CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir)); |
488 | 488 |
489 bool single_process = | 489 bool single_process = |
490 #if defined (GOOGLE_CHROME_BUILD) | 490 #if defined (GOOGLE_CHROME_BUILD) |
491 // This is an unsupported and not fully tested mode, so don't enable it for | 491 // This is an unsupported and not fully tested mode, so don't enable it for |
492 // official Chrome builds. | 492 // official Chrome builds. |
493 false; | 493 false; |
494 #else | 494 #else |
495 parsed_command_line.HasSwitch(switches::kSingleProcess); | 495 parsed_command_line.HasSwitch(switches::kSingleProcess); |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
593 | 593 |
594 logging::CleanupChromeLogging(); | 594 logging::CleanupChromeLogging(); |
595 | 595 |
596 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) | 596 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) |
597 // TODO(mark): See the TODO(mark) above at InitCrashReporter. | 597 // TODO(mark): See the TODO(mark) above at InitCrashReporter. |
598 DestructCrashReporter(); | 598 DestructCrashReporter(); |
599 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD | 599 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD |
600 | 600 |
601 return rv; | 601 return rv; |
602 } | 602 } |
OLD | NEW |