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

shouldUpload --> uploadToServer

Browse source
This commit is contained in:
Samuel Attard 2016-11-22 19:30:20 +11:00 • committed by Kevin Sawicki
parent a7dedb3a13
commit 2bf6f28152
11 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/common/api/atom_api_crash_reporter.cc
View file

@ -40,10 +40,10 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
base::Bind(&CrashReporter::Start, report));
dict.SetMethod("_getUploadedReports",
base::Bind(&CrashReporter::GetUploadedReports, report));
dict.SetMethod("_setShouldUpload",
base::Bind(&CrashReporter::SetShouldUpload, report));
dict.SetMethod("_getShouldUpload",
base::Bind(&CrashReporter::GetShouldUpload, report));
dict.SetMethod("_setUploadToServer",
base::Bind(&CrashReporter::SetUploadToServer, report));
dict.SetMethod("_getUploadToServer",
base::Bind(&CrashReporter::GetUploadToServer, report));
}
} // namespace

8
atom/common/crash_reporter/crash_reporter.cc
View file

@ -26,13 +26,13 @@ void CrashReporter::Start(const std::string& product_name,
const std::string& company_name,
const std::string& submit_url,
const base::FilePath& crashes_dir,
bool should_upload,
bool upload_to_server,
bool skip_system_crash_handler,
const StringMap& extra_parameters) {
SetUploadParameters(extra_parameters);
InitBreakpad(product_name, ATOM_VERSION_STRING, company_name, submit_url,
crashes_dir, should_upload, skip_system_crash_handler);
crashes_dir, upload_to_server, skip_system_crash_handler);
}
void CrashReporter::SetUploadParameters(const StringMap& parameters) {
@ -43,10 +43,10 @@ void CrashReporter::SetUploadParameters(const StringMap& parameters) {
SetUploadParameters();
}
void CrashReporter::SetShouldUpload(const bool should_upload) {
void CrashReporter::SetUploadToServer(const bool upload_to_server) {
}
bool CrashReporter::GetShouldUpload() {
bool CrashReporter::GetUploadToServer() {
return true;
}

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

@ -26,15 +26,15 @@ class CrashReporter {
const std::string& company_name,
const std::string& submit_url,
const base::FilePath& crashes_dir,
bool should_upload,
bool upload_to_server,
bool skip_system_crash_handler,
const StringMap& extra_parameters);
virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports(
const base::FilePath& crashes_dir);
virtual void SetShouldUpload(bool should_upload);
virtual bool GetShouldUpload();
virtual void SetUploadToServer(bool upload_to_server);
virtual bool GetUploadToServer();
protected:
CrashReporter();
@ -45,7 +45,7 @@ class CrashReporter {
const std::string& company_name,
const std::string& submit_url,
const base::FilePath& crashes_dir,
bool should_upload,
bool upload_to_server,
bool skip_system_crash_handler);
virtual void SetUploadParameters();

2
atom/common/crash_reporter/crash_reporter_linux.cc
View file

@ -60,7 +60,7 @@ void CrashReporterLinux::InitBreakpad(const std::string& product_name,
const std::string& company_name,
const std::string& submit_url,
const base::FilePath& crashes_dir,
bool should_upload,
bool upload_to_server,
bool skip_system_crash_handler) {
EnableCrashDumping(crashes_dir);

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

@ -32,7 +32,7 @@ class CrashReporterLinux : public CrashReporter {
const std::string& company_name,
const std::string& submit_url,
const base::FilePath& crashes_dir,
bool should_upload,
bool upload_to_server,
bool skip_system_crash_handler) override;
void SetUploadParameters() override;

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

@ -29,11 +29,11 @@ class CrashReporterMac : public CrashReporter {
const std::string& company_name,
const std::string& submit_url,
const base::FilePath& crashes_dir,
bool should_upload,
bool upload_to_server,
bool skip_system_crash_handler) override;
void SetUploadParameters() override;
void SetShouldUpload(bool should_upload) override;
bool GetShouldUpload() override;
void SetUploadToServer(bool upload_to_server) override;
bool GetUploadToServer() override;
private:
friend struct base::DefaultSingletonTraits<CrashReporterMac>;

10
atom/common/crash_reporter/crash_reporter_mac.mm
View file

@ -31,7 +31,7 @@ void CrashReporterMac::InitBreakpad(const std::string& product_name,
const std::string& company_name,
const std::string& submit_url,
const base::FilePath& crashes_dir,
bool should_upload,
bool upload_to_server,
bool skip_system_crash_handler) {
// check whether crashpad has been initialized.
// Only need to initialize once.
@ -75,11 +75,11 @@ void CrashReporterMac::InitBreakpad(const std::string& product_name,
if (is_browser_) {
database_ =
crashpad::CrashReportDatabase::Initialize(crashes_dir);
SetShouldUpload(should_upload);
SetUploadToServer(upload_to_server);
}
}
bool CrashReporterMac::GetShouldUpload() {
bool CrashReporterMac::GetUploadToServer() {
bool enabled = true;
if (database_) {
database_->GetSettings()->GetUploadsEnabled(&enabled);
@ -87,9 +87,9 @@ bool CrashReporterMac::GetShouldUpload() {
return enabled;
}
void CrashReporterMac::SetShouldUpload(const bool should_upload) {
void CrashReporterMac::SetUploadToServer(const bool upload_to_server) {
if (database_) {
database_->GetSettings()->SetUploadsEnabled(should_upload);
database_->GetSettings()->SetUploadsEnabled(upload_to_server);
}
}

2
atom/common/crash_reporter/crash_reporter_win.cc
View file

@ -150,7 +150,7 @@ void CrashReporterWin::InitBreakpad(const std::string& product_name,
const std::string& company_name,
const std::string& submit_url,
const base::FilePath& crashes_dir,
bool should_upload,
bool upload_to_server,
bool skip_system_crash_handler) {
skip_system_crash_handler_ = skip_system_crash_handler;

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

@ -28,7 +28,7 @@ class CrashReporterWin : public CrashReporter {
const std::string& company_name,
const std::string& submit_url,
const base::FilePath& crashes_dir,
bool should_upload,
bool upload_to_server,
bool skip_system_crash_handler) override;
void SetUploadParameters() override;