Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Side by Side Diff: chrome/app/chrome_exe_main_win.cc

Issue 2743923003: Revert "Make Crashpad start asynchronous, and move back to chrome_elf" (Closed)
Patch Set: . Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
Mark Mentovai 2017/03/10 21:15:28 CL description:
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 <windows.h> 5 #include <windows.h>
6 #include <malloc.h> 6 #include <malloc.h>
7 #include <shellscalingapi.h> 7 #include <shellscalingapi.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <tchar.h> 9 #include <tchar.h>
10 10
11 #include <algorithm> 11 #include <algorithm>
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 extern "C" void BlockUntilHandlerStartedImpl(); 223 extern "C" void BlockUntilHandlerStartedImpl();
224 #endif // SYZYASAN 224 #endif // SYZYASAN
225 225
226 #if !defined(WIN_CONSOLE_APP) 226 #if !defined(WIN_CONSOLE_APP)
227 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev, wchar_t*, int) { 227 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev, wchar_t*, int) {
228 #else 228 #else
229 int main() { 229 int main() {
230 HINSTANCE instance = GetModuleHandle(nullptr); 230 HINSTANCE instance = GetModuleHandle(nullptr);
231 #endif 231 #endif
232 install_static::InitializeFromPrimaryModule(); 232 install_static::InitializeFromPrimaryModule();
233 SignalInitializeCrashReporting();
233 234
234 // Initialize the CommandLine singleton from the environment. 235 // Initialize the CommandLine singleton from the environment.
235 base::CommandLine::Init(0, nullptr); 236 base::CommandLine::Init(0, nullptr);
236 const base::CommandLine* command_line = 237 const base::CommandLine* command_line =
237 base::CommandLine::ForCurrentProcess(); 238 base::CommandLine::ForCurrentProcess();
238 239
239 const std::string process_type = 240 const std::string process_type =
240 command_line->GetSwitchValueASCII(switches::kProcessType); 241 command_line->GetSwitchValueASCII(switches::kProcessType);
241 242
242 // Confirm that an explicit prefetch profile is used for all process types 243 // Confirm that an explicit prefetch profile is used for all process types
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 RemoveAppCompatFlagsEntry(); 279 RemoveAppCompatFlagsEntry();
279 280
280 // Load and launch the chrome dll. *Everything* happens inside. 281 // Load and launch the chrome dll. *Everything* happens inside.
281 VLOG(1) << "About to load main DLL."; 282 VLOG(1) << "About to load main DLL.";
282 MainDllLoader* loader = MakeMainDllLoader(); 283 MainDllLoader* loader = MakeMainDllLoader();
283 int rc = loader->Launch(instance, exe_entry_point_ticks); 284 int rc = loader->Launch(instance, exe_entry_point_ticks);
284 loader->RelaunchChromeBrowserWithNewCommandLineIfNeeded(); 285 loader->RelaunchChromeBrowserWithNewCommandLineIfNeeded();
285 delete loader; 286 delete loader;
286 return rc; 287 return rc;
287 } 288 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698