mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build issues

Browse source
This commit is contained in:
Samuel Attard 2016-11-08 13:25:18 +13:00 committed by Kevin Sawicki
parent 0d1804b2a0
commit 5a1a2616aa
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/common/crash_reporter/crash_reporter.h
View file

@ -33,7 +33,7 @@ class CrashReporter {
virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports( virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports(
const base::FilePath& crashes_dir); const base::FilePath& crashes_dir);
virtual void SetShouldUpload(); virtual void SetShouldUpload(bool should_upload);
protected: protected:
CrashReporter(); CrashReporter();

2
atom/common/crash_reporter/crash_reporter_mac.h
View file

@ -11,6 +11,7 @@
#include "atom/common/crash_reporter/crash_reporter.h" #include "atom/common/crash_reporter/crash_reporter.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/strings/string_piece.h" #include "base/strings/string_piece.h"
#include "vendor/crashpad/client/crash_report_database.h"
#include "vendor/crashpad/client/simple_string_dictionary.h" #include "vendor/crashpad/client/simple_string_dictionary.h"
namespace base { namespace base {
@ -31,6 +32,7 @@ class CrashReporterMac : public CrashReporter {
bool should_upload, bool should_upload,
bool skip_system_crash_handler) override; bool skip_system_crash_handler) override;
void SetUploadParameters() override; void SetUploadParameters() override;
void SetShouldUpload(bool should_upload) override;
private: private:
friend struct base::DefaultSingletonTraits<CrashReporterMac>; friend struct base::DefaultSingletonTraits<CrashReporterMac>;

4
lib/common/api/crash-reporter.js
View file

@ -20,7 +20,7 @@ class CrashReporter {
} else { } else {
if (typeof autoSubmit !== 'undefined') { if (typeof autoSubmit !== 'undefined') {
// TODO: Remove depreceated property in 2.0.0 // 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 shouldUpload = shouldUpload || autoSubmit
} }
@ -109,7 +109,7 @@ class CrashReporter {
setShouldUpload(shouldUpload) { setShouldUpload(shouldUpload) {
this._shouldUpload = shouldUpload this._shouldUpload = shouldUpload
return bindings._setShouldUpload(shouldUpload) return binding._setShouldUpload(shouldUpload)
} }
} }