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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 | 99 |
100 #if defined(OS_LINUX) || defined(OS_MACOSX) | 100 #if defined(OS_LINUX) || defined(OS_MACOSX) |
101 if (command_line->HasSwitch(switches::kHeadless)) { | 101 if (command_line->HasSwitch(switches::kHeadless)) { |
102 #if defined(OS_MACOSX) | 102 #if defined(OS_MACOSX) |
103 SetUpBundleOverrides(); | 103 SetUpBundleOverrides(); |
104 #endif | 104 #endif |
105 return headless::HeadlessShellMain(argc, argv); | 105 return headless::HeadlessShellMain(argc, argv); |
106 } | 106 } |
107 #endif // defined(OS_LINUX) || defined(OS_MACOSX) | 107 #endif // defined(OS_LINUX) || defined(OS_MACOSX) |
108 | 108 |
109 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) | 109 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) |
110 version_info::Channel channel = chrome::GetChannel(); | 110 version_info::Channel channel = chrome::GetChannel(); |
111 if (channel == version_info::Channel::CANARY || | 111 if (channel == version_info::Channel::CANARY || |
112 channel == version_info::Channel::UNKNOWN) { | 112 channel == version_info::Channel::UNKNOWN) { |
113 if (command_line->HasSwitch(switches::kMash) || | 113 if (command_line->HasSwitch(switches::kMash) || |
114 command_line->HasSwitch(switches::kMus)) { | 114 command_line->HasSwitch(switches::kMus)) { |
115 return MashMain(); | 115 return MashMain(); |
116 } | 116 } |
117 WaitForMashDebuggerIfNecessary(); | 117 WaitForMashDebuggerIfNecessary(); |
118 if (service_manager::ServiceManagerIsRemote()) | 118 if (service_manager::ServiceManagerIsRemote()) |
119 params.env_mode = aura::Env::Mode::MUS; | 119 params.env_mode = aura::Env::Mode::MUS; |
120 } | 120 } |
121 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) | 121 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) |
122 | 122 |
123 int rv = content::ContentMain(params); | 123 int rv = content::ContentMain(params); |
124 | 124 |
125 #if defined(OS_WIN) | 125 #if defined(OS_WIN) |
126 base::win::SetShouldCrashOnProcessDetach(false); | 126 base::win::SetShouldCrashOnProcessDetach(false); |
127 #endif | 127 #endif |
128 | 128 |
129 return rv; | 129 return rv; |
130 } | 130 } |
OLD | NEW |