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

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

Issue 371073003: Set dump_without_crashing_function_ in chrome.dll (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add comments Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « base/debug/dump_without_crashing.h ('k') | chrome/common/url_constants.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) 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 "chrome/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "content/public/app/content_main.h" 7 #include "content/public/app/content_main.h"
8 8
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #include "base/debug/dump_without_crashing.h"
10 #include "base/win/win_util.h" 11 #include "base/win/win_util.h"
12 #include "chrome/common/chrome_constants.h"
11 13
12 #define DLLEXPORT __declspec(dllexport) 14 #define DLLEXPORT __declspec(dllexport)
13 15
14 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling. 16 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling.
15 extern "C" { 17 extern "C" {
16 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, 18 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
17 sandbox::SandboxInterfaceInfo* sandbox_info); 19 sandbox::SandboxInterfaceInfo* sandbox_info);
18 } 20 }
19 #elif defined(OS_POSIX) 21 #elif defined(OS_POSIX)
20 extern "C" { 22 extern "C" {
(...skipping 10 matching lines...) Expand all
31 #endif 33 #endif
32 ChromeMainDelegate chrome_main_delegate; 34 ChromeMainDelegate chrome_main_delegate;
33 content::ContentMainParams params(&chrome_main_delegate); 35 content::ContentMainParams params(&chrome_main_delegate);
34 36
35 #if defined(OS_WIN) 37 #if defined(OS_WIN)
36 // The process should crash when going through abnormal termination. 38 // The process should crash when going through abnormal termination.
37 base::win::SetShouldCrashOnProcessDetach(true); 39 base::win::SetShouldCrashOnProcessDetach(true);
38 base::win::SetAbortBehaviorForCrashReporting(); 40 base::win::SetAbortBehaviorForCrashReporting();
39 params.instance = instance; 41 params.instance = instance;
40 params.sandbox_info = sandbox_info; 42 params.sandbox_info = sandbox_info;
43
44 // SetDumpWithoutCrashingFunction must be passed the DumpProcess function
45 // from the EXE and not from the DLL in order for DumpWithoutCrashing to
46 // function correctly.
47 typedef void (__cdecl *DumpProcessFunction)();
48 DumpProcessFunction DumpProcess = reinterpret_cast<DumpProcessFunction>(
49 ::GetProcAddress(::GetModuleHandle(chrome::kBrowserProcessExecutableName),
50 "DumpProcessWithoutCrash"));
51 base::debug::SetDumpWithoutCrashingFunction(DumpProcess);
41 #else 52 #else
42 params.argc = argc; 53 params.argc = argc;
43 params.argv = argv; 54 params.argv = argv;
44 #endif 55 #endif
45 56
46 int rv = content::ContentMain(params); 57 int rv = content::ContentMain(params);
47 58
48 #if defined(OS_WIN) 59 #if defined(OS_WIN)
49 base::win::SetShouldCrashOnProcessDetach(false); 60 base::win::SetShouldCrashOnProcessDetach(false);
50 #endif 61 #endif
51 62
52 return rv; 63 return rv;
53 } 64 }
OLDNEW
« no previous file with comments | « base/debug/dump_without_crashing.h ('k') | chrome/common/url_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698