From 5a1a2616aa790a1d4d70e6b72694ad6e5a71028c Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Tue, 8 Nov 2016 13:25:18 +1300 Subject: [PATCH] Fix build issues --- atom/common/crash_reporter/crash_reporter.h | 2 +- atom/common/crash_reporter/crash_reporter_mac.h | 2 ++ lib/common/api/crash-reporter.js | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/atom/common/crash_reporter/crash_reporter.h b/atom/common/crash_reporter/crash_reporter.h index c7dde01ddb49..caf445562822 100644 --- a/atom/common/crash_reporter/crash_reporter.h +++ b/atom/common/crash_reporter/crash_reporter.h @@ -33,7 +33,7 @@ class CrashReporter { virtual std::vector GetUploadedReports( const base::FilePath& crashes_dir); - virtual void SetShouldUpload(); + virtual void SetShouldUpload(bool should_upload); protected: CrashReporter(); diff --git a/atom/common/crash_reporter/crash_reporter_mac.h b/atom/common/crash_reporter/crash_reporter_mac.h index ddd037bb8e64..2e3c43639f75 100644 --- a/atom/common/crash_reporter/crash_reporter_mac.h +++ b/atom/common/crash_reporter/crash_reporter_mac.h @@ -11,6 +11,7 @@ #include "atom/common/crash_reporter/crash_reporter.h" #include "base/compiler_specific.h" #include "base/strings/string_piece.h" +#include "vendor/crashpad/client/crash_report_database.h" #include "vendor/crashpad/client/simple_string_dictionary.h" namespace base { @@ -31,6 +32,7 @@ class CrashReporterMac : public CrashReporter { bool should_upload, bool skip_system_crash_handler) override; void SetUploadParameters() override; + void SetShouldUpload(bool should_upload) override; private: friend struct base::DefaultSingletonTraits; diff --git a/lib/common/api/crash-reporter.js b/lib/common/api/crash-reporter.js index 4f2d3bd7643b..e17670321b71 100644 --- a/lib/common/api/crash-reporter.js +++ b/lib/common/api/crash-reporter.js @@ -20,7 +20,7 @@ class CrashReporter { } else { if (typeof autoSubmit !== 'undefined') { // TODO: Remove depreceated property in 2.0.0 - console.warn('The "autoSubmit" attribute on electron.crashReporter is depreceated. Please use "shouldUpload" instead.') + console.warn('The "autoSubmit" attribute on electron.crashReporter.start is depreceated. Please use "shouldUpload" instead.') } shouldUpload = shouldUpload || autoSubmit } @@ -109,7 +109,7 @@ class CrashReporter { setShouldUpload(shouldUpload) { this._shouldUpload = shouldUpload - return bindings._setShouldUpload(shouldUpload) + return binding._setShouldUpload(shouldUpload) } }