Fix build issues

diff --git a/atom/common/crash_reporter/crash_reporter.h b/atom/common/crash_reporter/crash_reporter.h
index c7dde01..caf4455 100644 (file)
--- 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<CrashReporter::UploadReportResult> 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 ddd037b..2e3c436 100644 (file)
--- 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<CrashReporterMac>;

diff --git a/lib/common/api/crash-reporter.js b/lib/common/api/crash-reporter.js
index 4f2d3bd..e176703 100644 (file)
--- 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)
   }
 }