| 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 <stdlib.h> | 7 #include <stdlib.h> |
| 8 | 8 |
| 9 #include "base/allocator/allocator_extension.h" | 9 #include "base/allocator/allocator_extension.h" |
| 10 #include "base/at_exit.h" | 10 #include "base/at_exit.h" |
| (...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 | 632 |
| 633 #if defined(OS_WIN) | 633 #if defined(OS_WIN) |
| 634 // Route stdio to parent console (if any) or create one. | 634 // Route stdio to parent console (if any) or create one. |
| 635 if (command_line.HasSwitch(switches::kEnableLogging)) | 635 if (command_line.HasSwitch(switches::kEnableLogging)) |
| 636 base::RouteStdioToConsole(); | 636 base::RouteStdioToConsole(); |
| 637 #endif | 637 #endif |
| 638 | 638 |
| 639 // Enable startup tracing asap to avoid early TRACE_EVENT calls being | 639 // Enable startup tracing asap to avoid early TRACE_EVENT calls being |
| 640 // ignored. | 640 // ignored. |
| 641 if (command_line.HasSwitch(switches::kTraceStartup)) { | 641 if (command_line.HasSwitch(switches::kTraceStartup)) { |
| 642 base::debug::CategoryFilter category_filter( |
| 643 command_line.GetSwitchValueASCII(switches::kTraceStartup)); |
| 642 base::debug::TraceLog::GetInstance()->SetEnabled( | 644 base::debug::TraceLog::GetInstance()->SetEnabled( |
| 643 command_line.GetSwitchValueASCII(switches::kTraceStartup), | 645 category_filter, |
| 644 base::debug::TraceLog::RECORD_UNTIL_FULL); | 646 base::debug::TraceLog::RECORD_UNTIL_FULL); |
| 645 } | 647 } |
| 646 | 648 |
| 647 #if defined(OS_MACOSX) && !defined(OS_IOS) | 649 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| 648 // We need to allocate the IO Ports before the Sandbox is initialized or | 650 // We need to allocate the IO Ports before the Sandbox is initialized or |
| 649 // the first instance of SystemMonitor is created. | 651 // the first instance of SystemMonitor is created. |
| 650 // It's important not to allocate the ports for processes which don't | 652 // It's important not to allocate the ports for processes which don't |
| 651 // register with the system monitor - see crbug.com/88867. | 653 // register with the system monitor - see crbug.com/88867. |
| 652 if (process_type.empty() || | 654 if (process_type.empty() || |
| 653 process_type == switches::kPluginProcess || | 655 process_type == switches::kPluginProcess || |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 817 | 819 |
| 818 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 820 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
| 819 }; | 821 }; |
| 820 | 822 |
| 821 // static | 823 // static |
| 822 ContentMainRunner* ContentMainRunner::Create() { | 824 ContentMainRunner* ContentMainRunner::Create() { |
| 823 return new ContentMainRunnerImpl(); | 825 return new ContentMainRunnerImpl(); |
| 824 } | 826 } |
| 825 | 827 |
| 826 } // namespace content | 828 } // namespace content |
| OLD | NEW |