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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 CHECK(DumpProcess); | 82 CHECK(DumpProcess); |
83 base::debug::SetDumpWithoutCrashingFunction(DumpProcess); | 83 base::debug::SetDumpWithoutCrashingFunction(DumpProcess); |
84 | 84 |
85 // Verify that chrome_elf and this module (chrome.dll and chrome_child.dll) | 85 // Verify that chrome_elf and this module (chrome.dll and chrome_child.dll) |
86 // have the same version. | 86 // have the same version. |
87 if (install_static::InstallDetails::Get().VersionMismatch()) | 87 if (install_static::InstallDetails::Get().VersionMismatch()) |
88 base::debug::DumpWithoutCrashing(); | 88 base::debug::DumpWithoutCrashing(); |
89 #else | 89 #else |
90 params.argc = argc; | 90 params.argc = argc; |
91 params.argv = argv; | 91 params.argv = argv; |
92 #endif | |
93 | |
94 #if !defined(OS_WIN) | |
95 base::CommandLine::Init(params.argc, params.argv); | 92 base::CommandLine::Init(params.argc, params.argv); |
| 93 #endif // defined(OS_WIN) |
| 94 base::CommandLine::Init(0, nullptr); |
96 const base::CommandLine* command_line(base::CommandLine::ForCurrentProcess()); | 95 const base::CommandLine* command_line(base::CommandLine::ForCurrentProcess()); |
97 ALLOW_UNUSED_LOCAL(command_line); | 96 ALLOW_UNUSED_LOCAL(command_line); |
98 #endif | |
99 | 97 |
100 #if defined(OS_LINUX) || defined(OS_MACOSX) | 98 #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) |
101 if (command_line->HasSwitch(switches::kHeadless)) { | 99 if (command_line->HasSwitch(switches::kHeadless)) { |
102 #if defined(OS_MACOSX) | 100 #if defined(OS_MACOSX) |
103 SetUpBundleOverrides(); | 101 SetUpBundleOverrides(); |
104 #endif | 102 #endif |
105 return headless::HeadlessShellMain(argc, argv); | 103 return headless::HeadlessShellMain(params); |
106 } | 104 } |
107 #endif // defined(OS_LINUX) || defined(OS_MACOSX) | 105 #endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) |
108 | 106 |
109 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) | 107 #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) |
110 version_info::Channel channel = chrome::GetChannel(); | 108 version_info::Channel channel = chrome::GetChannel(); |
111 if (channel == version_info::Channel::CANARY || | 109 if (channel == version_info::Channel::CANARY || |
112 channel == version_info::Channel::UNKNOWN) { | 110 channel == version_info::Channel::UNKNOWN) { |
113 if (command_line->HasSwitch(switches::kMash) || | 111 if (command_line->HasSwitch(switches::kMash) || |
114 command_line->HasSwitch(switches::kMus)) { | 112 command_line->HasSwitch(switches::kMus)) { |
115 return MashMain(); | 113 return MashMain(); |
116 } | 114 } |
117 WaitForMashDebuggerIfNecessary(); | 115 WaitForMashDebuggerIfNecessary(); |
118 if (service_manager::ServiceManagerIsRemote()) | 116 if (service_manager::ServiceManagerIsRemote()) |
119 params.env_mode = aura::Env::Mode::MUS; | 117 params.env_mode = aura::Env::Mode::MUS; |
120 } | 118 } |
121 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) | 119 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) |
122 | 120 |
123 int rv = content::ContentMain(params); | 121 int rv = content::ContentMain(params); |
124 | 122 |
125 #if defined(OS_WIN) | 123 #if defined(OS_WIN) |
126 base::win::SetShouldCrashOnProcessDetach(false); | 124 base::win::SetShouldCrashOnProcessDetach(false); |
127 #endif | 125 #endif |
128 | 126 |
129 return rv; | 127 return rv; |
130 } | 128 } |
OLD | NEW |