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

Side by Side Diff: chrome_elf/chrome_elf_main.cc

Issue 1144433004: Reland Issue 1132473003: Cache IsNonBrowserProcess (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <windows.h> 5 #include <windows.h>
6 6
7 #include "chrome_elf/chrome_elf_main.h" 7 #include "chrome_elf/chrome_elf_main.h"
8 8
9 #include "chrome_elf/blacklist/blacklist.h" 9 #include "chrome_elf/blacklist/blacklist.h"
10 #include "chrome_elf/breakpad.h" 10 #include "chrome_elf/breakpad.h"
11 #include "chrome_elf/chrome_elf_util.h"
11 #include "chrome_elf/ntdll_cache.h" 12 #include "chrome_elf/ntdll_cache.h"
12 13
13 void SignalChromeElf() { 14 void SignalChromeElf() {
14 blacklist::ResetBeacon(); 15 blacklist::ResetBeacon();
15 } 16 }
16 17
17 BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { 18 BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) {
18 if (reason == DLL_PROCESS_ATTACH) { 19 if (reason == DLL_PROCESS_ATTACH) {
20 InitializeProcessType();
grt (UTC plus 2) 2015/05/14 14:16:10 the problem was that this was happening too late?
Cait (Slow) 2015/05/14 14:50:16 InitializeCrashReporting() calls IsNonBrowserProce
19 InitializeCrashReporting(); 21 InitializeCrashReporting();
20 22
21 __try { 23 __try {
22 InitCache(); 24 InitCache();
23 blacklist::Initialize(false); // Don't force, abort if beacon is present. 25 blacklist::Initialize(false); // Don't force, abort if beacon is present.
24 } __except(GenerateCrashDump(GetExceptionInformation())) { 26 } __except(GenerateCrashDump(GetExceptionInformation())) {
25 } 27 }
26 } 28 }
27 29
28 return TRUE; 30 return TRUE;
29 } 31 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698