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

fixes and updates to GetParameters

Browse source
This commit is contained in:
Shelley Vohr 2017-10-31 13:51:44 -04:00
parent a9c13359dc
commit 3136f833a5
No known key found for this signature in database
GPG key ID: F13993A75599653C
6 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -80,8 +80,7 @@ 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() {}
@ -90,7 +89,7 @@ void CrashReporter::SetExtraParameter(const std::string& key,
void CrashReporter::RemoveExtraParameter(const std::string& key) {}
StringMap CrashReporter::GetParameters() {
std::map<std::string, std::string> CrashReporter::GetParameters() {
return upload_parameters_;
}

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

@ -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 CrashReporter::StringMap GetParameters();
virtual std::map<std::string, std::string> GetParameters();
protected:
CrashReporter();

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

@ -107,10 +107,11 @@ void CrashReporterMac::SetCrashKeyValue(const base::StringPiece& key,
void CrashReporterMac::SetExtraParameter(const std::string& key,
const std::string& value) {
if (simple_string_dictionary_)
if (simple_string_dictionary_) {
SetCrashKeyValue(key, value);
else
} else {
upload_parameters_[key] = value;
}
}
void CrashReporterMac::RemoveExtraParameter(const std::string& key) {