From 883c4b63d05bbcd1f7612752b299368a43148b8b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 5 Oct 2016 16:21:39 -0700 Subject: [PATCH] temp_path -> temp_dir --- atom/common/crash_reporter/crash_reporter.cc | 10 +++++----- atom/common/crash_reporter/crash_reporter.h | 6 +++--- atom/common/crash_reporter/crash_reporter_mac.h | 4 ++-- atom/common/crash_reporter/crash_reporter_mac.mm | 4 ++-- atom/common/crash_reporter/crash_reporter_win.cc | 4 ++-- atom/common/crash_reporter/crash_reporter_win.h | 2 +- lib/common/api/crash-reporter.js | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc index f7ddd76b44..2506e28a05 100644 --- 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::GetUploadedReports(const std::string& product_name, - const std::string& temp_path) { + const std::string& temp_dir) { std::vector 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 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 40a1f5a47e..b154a8d933 100644 --- 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 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 89fb235eb1..2cf189f3bf 100644 --- 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 GetUploadedReports( - const std::string& path, const std::string& temp_path) override; + const std::string& path, const std::string& temp_dir) override; std::unique_ptr simple_string_dictionary_; diff --git a/atom/common/crash_reporter/crash_reporter_mac.mm b/atom/common/crash_reporter/crash_reporter_mac.mm index 8c09e831ed..071c4fd28a 100644 --- 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 CrashReporterMac::GetUploadedReports(const std::string& product_name, - const std::string& temp_path) { + const std::string& temp_dir) { std::vector 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 e2fe6727e8..644556c180 100644 --- 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 a2265aaaa1..ec47cb7e66 100644 --- 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 ca429dfe1a..def77e72f6 100644 --- 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 = {