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

Unified Diff: components/crash/content/app/crashpad_win.cc

Issue 2031833002: Remove FilePath usage from the CrashReporterClient interface on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused constant to fix clang Created 4 years, 6 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
Index: components/crash/content/app/crashpad_win.cc
diff --git a/components/crash/content/app/crashpad_win.cc b/components/crash/content/app/crashpad_win.cc
index b08b8057baa5dd4187c2e5d0eb9cb9e51d3c3b9d..2144818d15ce4f6abdc3ee2960779a36164acdaf 100644
--- a/components/crash/content/app/crashpad_win.cc
+++ b/components/crash/content/app/crashpad_win.cc
@@ -38,7 +38,8 @@ void GetPlatformCrashpadAnnotations(
CHECK(PathService::Get(base::FILE_EXE, &exe_file));
base::string16 product_name, version, special_build, channel_name;
crash_reporter_client->GetProductNameAndVersion(
- exe_file, &product_name, &version, &special_build, &channel_name);
+ exe_file.value(), &product_name, &version, &special_build,
+ &channel_name);
(*annotations)["prod"] = base::UTF16ToUTF8(product_name);
(*annotations)["ver"] = base::UTF16ToUTF8(version);
(*annotations)["channel"] = base::UTF16ToUTF8(channel_name);
@@ -63,7 +64,10 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
if (initial_client) {
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
- crash_reporter_client->GetCrashDumpLocation(&database_path);
+
+ base::string16 database_path_str;
+ if (crash_reporter_client->GetCrashDumpLocation(&database_path_str))
+ database_path = base::FilePath(database_path_str);
std::map<std::string, std::string> process_annotations;
GetPlatformCrashpadAnnotations(&process_annotations);
@@ -82,7 +86,7 @@ base::FilePath PlatformCrashpadInitialization(bool initial_client,
CHECK(PathService::Get(base::FILE_EXE, &exe_file));
bool is_per_user_install =
- crash_reporter_client->GetIsPerUserInstall(exe_file);
+ crash_reporter_client->GetIsPerUserInstall(exe_file.value());
if (crash_reporter_client->GetShouldDumpLargerDumps(is_per_user_install)) {
const uint32_t kIndirectMemoryLimit = 4 * 1024 * 1024;
crashpad::CrashpadInfo::GetCrashpadInfo()
« no previous file with comments | « components/crash/content/app/crash_reporter_client.cc ('k') | content/shell/app/shell_crash_reporter_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698