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

Merge pull request #5640 from electron/update-crashpad

Browse source 
Update crashpad to latest master
This commit is contained in:
Cheng Zhao 2016-05-22 12:47:34 +00:00
commit b52b6e12c4
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,8 @@
#include "atom/common/crash_reporter/crash_reporter_mac.h" #include "atom/common/crash_reporter/crash_reporter_mac.h"
#include <memory>
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/mac/bundle_locations.h" #include "base/mac/bundle_locations.h"
@ -73,7 +75,7 @@ void CrashReporterMac::InitBreakpad(const std::string& product_name,
SetCrashKeyValue(upload_parameter.first, upload_parameter.second); SetCrashKeyValue(upload_parameter.first, upload_parameter.second);
} }
if (is_browser_) { if (is_browser_) {
scoped_ptr<crashpad::CrashReportDatabase> database = std::unique_ptr<crashpad::CrashReportDatabase> database =
crashpad::CrashReportDatabase::Initialize(database_path); crashpad::CrashReportDatabase::Initialize(database_path);
if (database) { if (database) {
database->GetSettings()->SetUploadsEnabled(auto_submit); database->GetSettings()->SetUploadsEnabled(auto_submit);
@ -99,7 +101,7 @@ CrashReporterMac::GetUploadedReports(const std::string& path) {
return uploaded_reports; return uploaded_reports;
} }
// Load crashpad database. // Load crashpad database.
scoped_ptr<crashpad::CrashReportDatabase> database = std::unique_ptr<crashpad::CrashReportDatabase> database =
crashpad::CrashReportDatabase::Initialize(file_path); crashpad::CrashReportDatabase::Initialize(file_path);
DCHECK(database); DCHECK(database);

2
vendor/crashpad vendored

@ -1 +1 @@
Subproject commit e2073935d7c674f4a9e7fced821f611c5b13f07b Subproject commit 51f78aefa872211022ae2d44260cbfd07a6aeb6a