Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Unified Diff: client/crash_report_database_win.cc

Issue 1121873002: win: add Settings object to CrashReportDatabaseWin (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698