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

Unified Diff: chrome/app/chrome_crash_reporter_client.cc

Issue 1016933002: Revert of Call RegisterCrashKeys for chrome.exe in static build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/crash/app/breakpad_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_crash_reporter_client.cc
diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc
index 8aea0a7f4c8cccc9d109cbc8f98ea997fda12469..25769f6cba1c476d807fcfad9a4b638df5a021e7 100644
--- a/chrome/app/chrome_crash_reporter_client.cc
+++ b/chrome/app/chrome_crash_reporter_client.cc
@@ -321,17 +321,10 @@
}
size_t ChromeCrashReporterClient::RegisterCrashKeys() {
- // Note: On Windows this only affects the EXE. A separate invocation from
- // child_process_logging_win.cc registers crash keys for Chrome.dll.
-#if defined(COMPONENT_BUILD)
- // On Windows, this is not called in a component build, as in that case a
- // single copy of 'base' is shared by the EXE and the various DLLs, and that
- // copy is configured by child_process_logging_win.cc.
- NOTREACHED();
- return 0;
-#else
+ // Note: This is not called on Windows because Breakpad is initialized in the
+ // EXE module, but code that uses crash keys is in the DLL module.
+ // RegisterChromeCrashKeys() will be called after the DLL is loaded.
return crash_keys::RegisterChromeCrashKeys();
-#endif
}
bool ChromeCrashReporterClient::IsRunningUnattended() {
« no previous file with comments | « no previous file | components/crash/app/breakpad_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698