| 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 "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
| 9 #include "chrome/app/chrome_main_delegate.h" | 9 #include "chrome/app/chrome_main_delegate.h" |
| 10 #include "chrome/common/features.h" | 10 #include "chrome/common/features.h" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 base::CommandLine::Init(params.argc, params.argv); | 87 base::CommandLine::Init(params.argc, params.argv); |
| 88 #endif | 88 #endif |
| 89 | 89 |
| 90 version_info::Channel channel = chrome::GetChannel(); | 90 version_info::Channel channel = chrome::GetChannel(); |
| 91 if (channel == version_info::Channel::CANARY || | 91 if (channel == version_info::Channel::CANARY || |
| 92 channel == version_info::Channel::UNKNOWN) { | 92 channel == version_info::Channel::UNKNOWN) { |
| 93 const base::CommandLine& command_line = | 93 const base::CommandLine& command_line = |
| 94 *base::CommandLine::ForCurrentProcess(); | 94 *base::CommandLine::ForCurrentProcess(); |
| 95 if (command_line.HasSwitch("mash")) | 95 if (command_line.HasSwitch("mash")) |
| 96 return MashMain(); | 96 return MashMain(); |
| 97 WaitForMashDebuggerIfNecessary(); |
| 97 } | 98 } |
| 98 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) | 99 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) |
| 99 | 100 |
| 100 int rv = content::ContentMain(params); | 101 int rv = content::ContentMain(params); |
| 101 | 102 |
| 102 #if defined(OS_WIN) | 103 #if defined(OS_WIN) |
| 103 base::win::SetShouldCrashOnProcessDetach(false); | 104 base::win::SetShouldCrashOnProcessDetach(false); |
| 104 #endif | 105 #endif |
| 105 | 106 |
| 106 return rv; | 107 return rv; |
| 107 } | 108 } |
| OLD | NEW |