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/browser/browser_main.h" | 5 #include "content/browser/browser_main.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "content/common/content_constants_internal.h" | 8 #include "content/common/content_constants_internal.h" |
9 #include "content/public/browser/browser_main_runner.h" | 9 #include "content/public/browser/browser_main_runner.h" |
10 | 10 |
11 namespace content { | 11 namespace content { |
12 | 12 |
13 // Main routine for running as the Browser process. | 13 // Main routine for running as the Browser process. |
14 int BrowserMain(const MainFunctionParams& parameters) { | 14 int BrowserMain(const MainFunctionParams& parameters) { |
15 TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, ""); | 15 TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, ""); |
16 base::debug::TraceLog::GetInstance()->SetProcessName("Browser"); | 16 base::debug::TraceLog::GetInstance()->SetProcessName("Browser"); |
17 base::debug::TraceLog::GetInstance()->SetProcessSortIndex( | 17 base::debug::TraceLog::GetInstance()->SetProcessSortIndex( |
18 kTraceEventBrowserProcessSortIndex); | 18 kTraceEventBrowserProcessSortIndex); |
19 | 19 |
20 scoped_ptr<BrowserMainRunner> main_runner(BrowserMainRunner::Create()); | 20 scoped_ptr<BrowserMainRunner> main_runner(BrowserMainRunner::Create()); |
21 | 21 |
22 int exit_code = main_runner->Initialize(parameters); | 22 scoped_refptr<content::StartupTaskRunner> startup_task_runner = |
| 23 make_scoped_refptr(new content::StartupTaskRunner( |
| 24 content::StartupTaskRunner::IMMEDIATE, NULL)); |
| 25 |
| 26 int exit_code = main_runner->Initialize(parameters, startup_task_runner); |
23 if (exit_code >= 0) | 27 if (exit_code >= 0) |
24 return exit_code; | 28 return exit_code; |
25 | 29 |
26 exit_code = main_runner->Run(); | 30 exit_code = main_runner->Run(); |
27 | 31 |
28 main_runner->Shutdown(); | 32 main_runner->Shutdown(); |
29 | 33 |
30 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 34 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
31 | 35 |
32 return exit_code; | 36 return exit_code; |
33 } | 37 } |
34 | 38 |
35 } // namespace content | 39 } // namespace content |
OLD | NEW |