| 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/app/chrome_main_delegate.h" | 10 #include "chrome/app/chrome_main_delegate.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) | 97 #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) |
| 98 if (command_line->HasSwitch(switches::kHeadless)) { | 98 if (command_line->HasSwitch(switches::kHeadless)) { |
| 99 #if defined(OS_MACOSX) | 99 #if defined(OS_MACOSX) |
| 100 SetUpBundleOverrides(); | 100 SetUpBundleOverrides(); |
| 101 #endif | 101 #endif |
| 102 return headless::HeadlessShellMain(params); | 102 return headless::HeadlessShellMain(params); |
| 103 } | 103 } |
| 104 #endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) | 104 #endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) |
| 105 | 105 |
| 106 #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) | 106 #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) |
| 107 if (command_line->GetSwitchValueASCII(switches::kProcessType) == | 107 if (command_line->HasSwitch(switches::kMemlog)) |
| 108 "profiling") { | |
| 109 return profiling::ProfilingMain(*command_line); | 108 return profiling::ProfilingMain(*command_line); |
| 110 } | |
| 111 #endif // ENABLE_OOP_HEAP_PROFILING | 109 #endif // ENABLE_OOP_HEAP_PROFILING |
| 112 | 110 |
| 113 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) | 111 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) |
| 114 if (service_manager::ServiceManagerIsRemote()) | 112 if (service_manager::ServiceManagerIsRemote()) |
| 115 params.env_mode = aura::Env::Mode::MUS; | 113 params.env_mode = aura::Env::Mode::MUS; |
| 116 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) | 114 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) |
| 117 | 115 |
| 118 int rv = content::ContentMain(params); | 116 int rv = content::ContentMain(params); |
| 119 | 117 |
| 120 #if defined(OS_WIN) | 118 #if defined(OS_WIN) |
| 121 base::win::SetShouldCrashOnProcessDetach(false); | 119 base::win::SetShouldCrashOnProcessDetach(false); |
| 122 #endif | 120 #endif |
| 123 | 121 |
| 124 return rv; | 122 return rv; |
| 125 } | 123 } |
| OLD | NEW |