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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 #if defined(OS_WIN) | 496 #if defined(OS_WIN) |
497 sandbox_wrapper.SetServices(sandbox_info); | 497 sandbox_wrapper.SetServices(sandbox_info); |
498 #endif | 498 #endif |
499 sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type); | 499 sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type); |
500 | 500 |
501 #if defined(OS_WIN) | 501 #if defined(OS_WIN) |
502 _Module.Init(NULL, instance); | 502 _Module.Init(NULL, instance); |
503 #endif | 503 #endif |
504 | 504 |
505 // Notice a user data directory override if any | 505 // Notice a user data directory override if any |
506 const std::wstring user_data_dir = | 506 const FilePath user_data_dir = FilePath::FromWStringHack( |
507 parsed_command_line.GetSwitchValue(switches::kUserDataDir); | 507 parsed_command_line.GetSwitchValue(switches::kUserDataDir)); |
508 if (!user_data_dir.empty()) | 508 if (!user_data_dir.empty()) |
509 CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir)); | 509 CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir)); |
510 | 510 |
511 bool single_process = | 511 bool single_process = |
512 #if defined (GOOGLE_CHROME_BUILD) | 512 #if defined (GOOGLE_CHROME_BUILD) |
513 // This is an unsupported and not fully tested mode, so don't enable it for | 513 // This is an unsupported and not fully tested mode, so don't enable it for |
514 // official Chrome builds. | 514 // official Chrome builds. |
515 false; | 515 false; |
516 #else | 516 #else |
517 parsed_command_line.HasSwitch(switches::kSingleProcess); | 517 parsed_command_line.HasSwitch(switches::kSingleProcess); |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
615 | 615 |
616 logging::CleanupChromeLogging(); | 616 logging::CleanupChromeLogging(); |
617 | 617 |
618 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) | 618 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) |
619 // TODO(mark): See the TODO(mark) above at InitCrashReporter. | 619 // TODO(mark): See the TODO(mark) above at InitCrashReporter. |
620 DestructCrashReporter(); | 620 DestructCrashReporter(); |
621 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD | 621 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD |
622 | 622 |
623 return rv; | 623 return rv; |
624 } | 624 } |
OLD | NEW |