From 43ef4faf7953d62d488142bed80312153b3798dc Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 24 Jan 2017 13:58:39 -0800 Subject: [PATCH] :art: --- atom/app/node_main.cc | 8 ++++---- atom/common/crash_reporter/crash_reporter.cc | 1 - atom/common/crash_reporter/crash_reporter.h | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc index af33c05d631e..9e80ef2e5d2a 100644 --- a/atom/app/node_main.cc +++ b/atom/app/node_main.cc @@ -62,10 +62,10 @@ int NodeMain(int argc, char *argv[]) { #endif process.SetMethod("crash", &AtomBindings::Crash); - auto crashReporter = mate::Dictionary::CreateEmpty(gin_env.isolate()); - crashReporter.SetMethod("start", - &crash_reporter::CrashReporter::StartInstance); - process.Set("crashReporter", crashReporter); + // Setup process.crashReporter.start in child node processes + auto reporter = mate::Dictionary::CreateEmpty(gin_env.isolate()); + reporter.SetMethod("start", &crash_reporter::CrashReporter::StartInstance); + process.Set("crashReporter", reporter); node::LoadEnvironment(env); diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc index a36e5525b665..f8a5f5e29ecb 100644 --- a/atom/common/crash_reporter/crash_reporter.cc +++ b/atom/common/crash_reporter/crash_reporter.cc @@ -116,5 +116,4 @@ void CrashReporter::StartInstance(const mate::Dictionary& options) { false, extra_parameters); } - } // namespace crash_reporter diff --git a/atom/common/crash_reporter/crash_reporter.h b/atom/common/crash_reporter/crash_reporter.h index df05574fcb44..c564527109b8 100644 --- a/atom/common/crash_reporter/crash_reporter.h +++ b/atom/common/crash_reporter/crash_reporter.h @@ -31,6 +31,7 @@ class CrashReporter { bool upload_to_server, bool skip_system_crash_handler, const StringMap& extra_parameters); + virtual std::vector GetUploadedReports( const base::FilePath& crashes_dir);