| Index: client/crash_report_database_win.cc
|
| diff --git a/client/crash_report_database_win.cc b/client/crash_report_database_win.cc
|
| index 894f922625dc4ea544f43aa0abd445fb7f5d2ae7..ff120e8a400114952cacedc56d7b734c1eaec2f6 100644
|
| --- a/client/crash_report_database_win.cc
|
| +++ b/client/crash_report_database_win.cc
|
| @@ -23,6 +23,7 @@
|
| #include "base/strings/string16.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "client/settings.h"
|
| #include "util/misc/initialization_state_dcheck.h"
|
|
|
| namespace crashpad {
|
| @@ -32,6 +33,8 @@ namespace {
|
| const wchar_t kReportsDirectory[] = L"reports";
|
| const wchar_t kMetadataFileName[] = L"metadata";
|
|
|
| +const wchar_t kSettings[] = L"settings.dat";
|
| +
|
| const wchar_t kCrashReportFileExtension[] = L"dmp";
|
|
|
| const uint32_t kMetadataFileHeaderMagic = 'CPAD';
|
| @@ -533,13 +536,17 @@ class CrashReportDatabaseWin : public CrashReportDatabase {
|
| scoped_ptr<Metadata> AcquireMetadata();
|
|
|
| base::FilePath base_dir_;
|
| + Settings settings_;
|
| InitializationStateDcheck initialized_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CrashReportDatabaseWin);
|
| };
|
|
|
| CrashReportDatabaseWin::CrashReportDatabaseWin(const base::FilePath& path)
|
| - : CrashReportDatabase(), base_dir_(path), initialized_() {
|
| + : CrashReportDatabase(),
|
| + base_dir_(path),
|
| + settings_(base_dir_.Append(kSettings)),
|
| + initialized_() {
|
| }
|
|
|
| CrashReportDatabaseWin::~CrashReportDatabaseWin() {
|
| @@ -562,10 +569,7 @@ bool CrashReportDatabaseWin::Initialize() {
|
|
|
| Settings* CrashReportDatabaseWin::GetSettings() {
|
| INITIALIZATION_STATE_DCHECK_VALID(initialized_);
|
| -
|
| - // Port to Win https://code.google.com/p/crashpad/issues/detail?id=13.
|
| - NOTREACHED();
|
| - return nullptr;
|
| + return &settings_;
|
| }
|
|
|
| OperationStatus CrashReportDatabaseWin::PrepareNewCrashReport(
|
|
|