Browse Source

add const and other small edits

Shelley Vohr 7 years ago
parent
commit
93df164485

+ 1 - 1
atom/common/api/atom_api_crash_reporter.cc

@@ -39,7 +39,7 @@ void RemoveExtraParameter(const std::string& key) {
   CrashReporter::GetInstance()->RemoveExtraParameter(key);
 }
 
-std::map<std::string, std::string> GetParameters() {
+std::map<std::string, std::string> GetParameters() const {
   return CrashReporter::GetInstance()->GetParameters();
 }
 

+ 9 - 5
atom/common/crash_reporter/crash_reporter.cc

@@ -80,16 +80,20 @@ void CrashReporter::InitBreakpad(const std::string& product_name,
                                  const std::string& submit_url,
                                  const base::FilePath& crashes_dir,
                                  bool auto_submit,
-                                 bool skip_system_crash_handler) {}
+                                 bool skip_system_crash_handler) {
+}
 
-void CrashReporter::SetUploadParameters() {}
+void CrashReporter::SetUploadParameters() {
+}
 
 void CrashReporter::SetExtraParameter(const std::string& key,
-                                      const std::string& value) {}
+                                      const std::string& value) {
+}
 
-void CrashReporter::RemoveExtraParameter(const std::string& key) {}
+void CrashReporter::RemoveExtraParameter(const std::string& key) {
+}
 
-std::map<std::string, std::string> CrashReporter::GetParameters() {
+std::map<std::string, std::string> CrashReporter::GetParameters() const {
   return upload_parameters_;
 }
 

+ 1 - 1
atom/common/crash_reporter/crash_reporter.h

@@ -40,7 +40,7 @@ class CrashReporter {
   virtual void SetExtraParameter(const std::string& key,
                                  const std::string& value);
   virtual void RemoveExtraParameter(const std::string& key);
-  virtual std::map<std::string, std::string> GetParameters();
+  virtual std::map<std::string, std::string> GetParameters() const;
 
  protected:
   CrashReporter();

+ 1 - 1
atom/common/crash_reporter/crash_reporter_mac.h

@@ -38,7 +38,7 @@ class CrashReporterMac : public CrashReporter {
   void SetExtraParameter(const std::string& key,
                          const std::string& value) override;
   void RemoveExtraParameter(const std::string& key) override;
-  std::map<std::string, std::string> GetParameters() override;
+  std::map<std::string, std::string> GetParameters() const override;
 
  private:
   friend struct base::DefaultSingletonTraits<CrashReporterMac>;

+ 3 - 4
atom/common/crash_reporter/crash_reporter_mac.mm

@@ -121,19 +121,18 @@ void CrashReporterMac::RemoveExtraParameter(const std::string& key) {
     upload_parameters_.erase(key);
 }
 
-std::map<std::string, std::string> CrashReporterMac::GetParameters() {
+std::map<std::string, std::string> CrashReporterMac::GetParameters() const {
   if (simple_string_dictionary_) {
     std::map<std::string, std::string> ret;
     crashpad::SimpleStringDictionary::Iterator iter(*simple_string_dictionary_);
     for(;;) {
-      const crashpad::SimpleStringDictionary::Entry* entry = iter.Next();
+      const auto entry = iter.Next();
       if (!entry) break;
       ret[entry->key] = entry->value;
     }
     return ret;
-  } else {
-    return upload_parameters_;
   }
+  return upload_parameters_;
 }
 
 std::vector<CrashReporter::UploadReportResult>

+ 5 - 2
lib/common/api/crash-reporter.js

@@ -20,7 +20,8 @@ class CrashReporter {
       uploadToServer
     } = options
 
-    if (uploadToServer == null) uploadToServer = options.autoSubmit || true
+    if (uploadToServer == null) uploadToServer = options.autoSubmit
+    if (uploadToServer == null) uploadToServer = true
     if (ignoreSystemCrashHandler == null) ignoreSystemCrashHandler = false
     if (extra == null) extra = {}
 
@@ -36,7 +37,9 @@ class CrashReporter {
     }
 
     if (process.platform === 'win32') {
-      const env = { ELECTRON_INTERNAL_CRASH_SERVICE: 1 }
+      const env = {
+        ELECTRON_INTERNAL_CRASH_SERVICE: 1
+      }
       const args = [
         '--reporter-url=' + submitURL,
         '--application-name=' + this.getProductName(),

+ 4 - 4
spec/api-crash-reporter-spec.js

@@ -11,7 +11,7 @@ const {closeWindow} = require('./window-helpers')
 const {remote} = require('electron')
 const {app, BrowserWindow, crashReporter} = remote.require('electron')
 
-describe('crashReporter module', () => {
+describe.only('crashReporter module', () => {
   if (process.mas || process.env.DISABLE_CRASH_REPORTER_TESTS) return
 
   let originalTempDirectory = null
@@ -197,10 +197,10 @@ describe('crashReporter module', () => {
   describe('getProductName', () => {
     it('returns the product name if one is specified', () => {
       const name = crashReporter.getProductName()
-      if (process.platform === 'win32') {
-        assert.equal(name, 'Zombies')
-      } else {
+      if (process.platform === 'darwin') {
         assert.equal(name, 'Electron Test')
+      } else {
+        assert.equal(name, 'Zombies')
       }
     })
   })