| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "content/public/app/content_main_runner.h" | 5 #include "content/public/app/content_main_runner.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdlib.h> | 8 #include <stdlib.h> |
| 9 #include <string.h> | 9 #include <string.h> |
| 10 | |
| 11 #include <string> | 10 #include <string> |
| 11 #include <utility> |
| 12 | 12 |
| 13 #include "base/allocator/allocator_extension.h" | 13 #include "base/allocator/allocator_extension.h" |
| 14 #include "base/at_exit.h" | 14 #include "base/at_exit.h" |
| 15 #include "base/command_line.h" | 15 #include "base/command_line.h" |
| 16 #include "base/debug/debugger.h" | 16 #include "base/debug/debugger.h" |
| 17 #include "base/debug/stack_trace.h" | 17 #include "base/debug/stack_trace.h" |
| 18 #include "base/files/file_path.h" | 18 #include "base/files/file_path.h" |
| 19 #include "base/i18n/icu_util.h" | 19 #include "base/i18n/icu_util.h" |
| 20 #include "base/lazy_instance.h" | 20 #include "base/lazy_instance.h" |
| 21 #include "base/logging.h" | 21 #include "base/logging.h" |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 { switches::kUtilityProcess, UtilityMain }, | 279 { switches::kUtilityProcess, UtilityMain }, |
| 280 }; | 280 }; |
| 281 | 281 |
| 282 ScopedVector<ZygoteForkDelegate> zygote_fork_delegates; | 282 ScopedVector<ZygoteForkDelegate> zygote_fork_delegates; |
| 283 if (delegate) { | 283 if (delegate) { |
| 284 delegate->ZygoteStarting(&zygote_fork_delegates); | 284 delegate->ZygoteStarting(&zygote_fork_delegates); |
| 285 media::InitializeMediaLibrary(); | 285 media::InitializeMediaLibrary(); |
| 286 } | 286 } |
| 287 | 287 |
| 288 // This function call can return multiple times, once per fork(). | 288 // This function call can return multiple times, once per fork(). |
| 289 if (!ZygoteMain(main_function_params, zygote_fork_delegates.Pass())) | 289 if (!ZygoteMain(main_function_params, std::move(zygote_fork_delegates))) |
| 290 return 1; | 290 return 1; |
| 291 | 291 |
| 292 if (delegate) delegate->ZygoteForked(); | 292 if (delegate) delegate->ZygoteForked(); |
| 293 | 293 |
| 294 // Zygote::HandleForkRequest may have reallocated the command | 294 // Zygote::HandleForkRequest may have reallocated the command |
| 295 // line so update it here with the new version. | 295 // line so update it here with the new version. |
| 296 const base::CommandLine& command_line = | 296 const base::CommandLine& command_line = |
| 297 *base::CommandLine::ForCurrentProcess(); | 297 *base::CommandLine::ForCurrentProcess(); |
| 298 std::string process_type = | 298 std::string process_type = |
| 299 command_line.GetSwitchValueASCII(switches::kProcessType); | 299 command_line.GetSwitchValueASCII(switches::kProcessType); |
| (...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 854 | 854 |
| 855 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 855 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
| 856 }; | 856 }; |
| 857 | 857 |
| 858 // static | 858 // static |
| 859 ContentMainRunner* ContentMainRunner::Create() { | 859 ContentMainRunner* ContentMainRunner::Create() { |
| 860 return new ContentMainRunnerImpl(); | 860 return new ContentMainRunnerImpl(); |
| 861 } | 861 } |
| 862 | 862 |
| 863 } // namespace content | 863 } // namespace content |
| OLD | NEW |