temp_path -> temp_dir

diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc
index f7ddd76..2506e28 100644 (file)
--- a/atom/common/crash_reporter/crash_reporter.cc
+++ b/atom/common/crash_reporter/crash_reporter.cc
@@ -25,14 +25,14 @@ CrashReporter::~CrashReporter() {
 void CrashReporter::Start(const std::string& product_name,
                           const std::string& company_name,
                           const std::string& submit_url,
-                          const std::string& temp_path,
+                          const std::string& temp_dir,
                           bool auto_submit,
                           bool skip_system_crash_handler,
                           const StringMap& extra_parameters) {
   SetUploadParameters(extra_parameters);
 
   InitBreakpad(product_name, ATOM_VERSION_STRING, company_name, submit_url,
-               temp_path, auto_submit, skip_system_crash_handler);
+               temp_dir, auto_submit, skip_system_crash_handler);
 }
 
 base::FilePath CrashReporter::GetCrashesDirectory(
@@ -50,11 +50,11 @@ void CrashReporter::SetUploadParameters(const StringMap& parameters) {
 
 std::vector<CrashReporter::UploadReportResult>
 CrashReporter::GetUploadedReports(const std::string& product_name,
-                                  const std::string& temp_path) {
+                                  const std::string& temp_dir) {
   std::vector<CrashReporter::UploadReportResult> result;
 
   base::FilePath uploads_path =
-      GetCrashesDirectory(product_name, temp_path).Append("uploads.log");
+      GetCrashesDirectory(product_name, temp_dir).Append("uploads.log");
   std::string file_content;
   if (base::ReadFileToString(uploads_path, &file_content)) {
     std::vector<std::string> reports = base::SplitString(
@@ -77,7 +77,7 @@ void CrashReporter::InitBreakpad(const std::string& product_name,
                                  const std::string& version,
                                  const std::string& company_name,
                                  const std::string& submit_url,
-                                 const std::string& temp_path,
+                                 const std::string& temp_dir,
                                  bool auto_submit,
                                  bool skip_system_crash_handler) {
 }

diff --git a/atom/common/crash_reporter/crash_reporter.h b/atom/common/crash_reporter/crash_reporter.h
index 40a1f5a..b154a8d 100644 (file)
--- a/atom/common/crash_reporter/crash_reporter.h
+++ b/atom/common/crash_reporter/crash_reporter.h
@@ -25,14 +25,14 @@ class CrashReporter {
   void Start(const std::string& product_name,
              const std::string& company_name,
              const std::string& submit_url,
-             const std::string& temp_path,
+             const std::string& temp_dir,
              bool auto_submit,
              bool skip_system_crash_handler,
              const StringMap& extra_parameters);
 
   virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports(
       const std::string& product_name,
-      const std::string& temp_path);
+      const std::string& temp_dir);
 
   base::FilePath GetCrashesDirectory(const std::string& product_name,
                                      const std::string& temp_dir);
@@ -45,7 +45,7 @@ class CrashReporter {
                             const std::string& version,
                             const std::string& company_name,
                             const std::string& submit_url,
-                            const std::string& temp_path,
+                            const std::string& temp_dir,
                             bool auto_submit,
                             bool skip_system_crash_handler);
   virtual void SetUploadParameters();

diff --git a/atom/common/crash_reporter/crash_reporter_mac.h b/atom/common/crash_reporter/crash_reporter_mac.h
index 89fb235..2cf189f 100644 (file)
--- a/atom/common/crash_reporter/crash_reporter_mac.h
+++ b/atom/common/crash_reporter/crash_reporter_mac.h
@@ -27,7 +27,7 @@ class CrashReporterMac : public CrashReporter {
                     const std::string& version,
                     const std::string& company_name,
                     const std::string& submit_url,
-                    const std::string& temp_path,
+                    const std::string& temp_dir,
                     bool auto_submit,
                     bool skip_system_crash_handler) override;
   void SetUploadParameters() override;
@@ -43,7 +43,7 @@ class CrashReporterMac : public CrashReporter {
                         const base::StringPiece& value);
 
   std::vector<UploadReportResult> GetUploadedReports(
-      const std::string& path, const std::string& temp_path) override;
+      const std::string& path, const std::string& temp_dir) override;
 
   std::unique_ptr<crashpad::SimpleStringDictionary> simple_string_dictionary_;
 

diff --git a/atom/common/crash_reporter/crash_reporter_mac.mm b/atom/common/crash_reporter/crash_reporter_mac.mm
index 8c09e83..071c4fd 100644 (file)
--- a/atom/common/crash_reporter/crash_reporter_mac.mm
+++ b/atom/common/crash_reporter/crash_reporter_mac.mm
@@ -94,10 +94,10 @@ void CrashReporterMac::SetCrashKeyValue(const base::StringPiece& key,
 
 std::vector<CrashReporter::UploadReportResult>
 CrashReporterMac::GetUploadedReports(const std::string& product_name,
-                                     const std::string& temp_path) {
+                                     const std::string& temp_dir) {
   std::vector<CrashReporter::UploadReportResult> uploaded_reports;
 
-  base::FilePath file_path = GetCrashesDirectory(product_name, temp_path);
+  base::FilePath file_path = GetCrashesDirectory(product_name, temp_dir);
   if (!base::PathExists(file_path)) {
     return uploaded_reports;
   }

diff --git a/atom/common/crash_reporter/crash_reporter_win.cc b/atom/common/crash_reporter/crash_reporter_win.cc
index e2fe672..644556c 100644 (file)
--- a/atom/common/crash_reporter/crash_reporter_win.cc
+++ b/atom/common/crash_reporter/crash_reporter_win.cc
@@ -149,7 +149,7 @@ void CrashReporterWin::InitBreakpad(const std::string& product_name,
                                     const std::string& version,
                                     const std::string& company_name,
                                     const std::string& submit_url,
-                                    const std::string& temp_path,
+                                    const std::string& temp_dir,
                                     bool auto_submit,
                                     bool skip_system_crash_handler) {
   skip_system_crash_handler_ = skip_system_crash_handler;
@@ -172,7 +172,7 @@ void CrashReporterWin::InitBreakpad(const std::string& product_name,
   breakpad_.reset();
 
   breakpad_.reset(new google_breakpad::ExceptionHandler(
-      temp_path,
+      temp_dir,
       FilterCallback,
       MinidumpCallback,
       this,

diff --git a/atom/common/crash_reporter/crash_reporter_win.h b/atom/common/crash_reporter/crash_reporter_win.h
index a2265aa..ec47cb7 100644 (file)
--- a/atom/common/crash_reporter/crash_reporter_win.h
+++ b/atom/common/crash_reporter/crash_reporter_win.h
@@ -27,7 +27,7 @@ class CrashReporterWin : public CrashReporter {
                     const std::string& version,
                     const std::string& company_name,
                     const std::string& submit_url,
-                    const std::string& temp_dir
+                    const std::string& temp_dir,
                     bool auto_submit,
                     bool skip_system_crash_handler) override;
   void SetUploadParameters() override;

diff --git a/lib/common/api/crash-reporter.js b/lib/common/api/crash-reporter.js
index ca429df..def77e7 100644 (file)
--- a/lib/common/api/crash-reporter.js
+++ b/lib/common/api/crash-reporter.js
@@ -46,7 +46,7 @@ class CrashReporter {
       const args = [
         '--reporter-url=' + submitURL,
         '--application-name=' + this.productName,
-        '--crashes-directory=' + bindings._getCrashesDirectory(this.productName, this.tempDirectory),
+        '--crashes-directory=' + binding._getCrashesDirectory(this.productName, this.tempDirectory),
         '--v=1'
       ]
       const env = {