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

Unified Diff: content/shell/app/shell_crash_reporter_client.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: Fix build error Created 4 years, 7 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: content/shell/app/shell_crash_reporter_client.cc
diff --git a/content/shell/app/shell_crash_reporter_client.cc b/content/shell/app/shell_crash_reporter_client.cc
index 9ede5ebbfffa0b27e56e1f49c68834a3d5cd72d1..fec6540caa7bd046d894f5664184be4859a435c3 100644
--- a/content/shell/app/shell_crash_reporter_client.cc
+++ b/content/shell/app/shell_crash_reporter_client.cc
@@ -23,7 +23,7 @@ ShellCrashReporterClient::~ShellCrashReporterClient() {}
#if defined(OS_WIN)
void ShellCrashReporterClient::GetProductNameAndVersion(
- const base::FilePath& exe_path,
+ const base::string16& exe_path,
base::string16* product_name,
base::string16* version,
base::string16* special_build,
@@ -48,6 +48,16 @@ base::FilePath ShellCrashReporterClient::GetReporterLogFilename() {
}
#endif
+#if defined(OS_WIN)
+bool ShellCrashReporterClient::GetCrashDumpLocation(base::string16* crash_dir) {
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kCrashDumpsDir))
+ return false;
+ *crash_dir = base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+ switches::kCrashDumpsDir).value();
+ return true;
+}
+#else
bool ShellCrashReporterClient::GetCrashDumpLocation(base::FilePath* crash_dir) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kCrashDumpsDir))
@@ -56,6 +66,7 @@ bool ShellCrashReporterClient::GetCrashDumpLocation(base::FilePath* crash_dir) {
switches::kCrashDumpsDir);
scottmg 2016/06/02 00:09:30 can you just #if the signature and the .value() in
ananta 2016/06/02 00:22:57 Done.
return true;
}
+#endif
#if defined(OS_ANDROID)
int ShellCrashReporterClient::GetAndroidMinidumpDescriptor() {
« chrome/install_static/install_util.h ('K') | « content/shell/app/shell_crash_reporter_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698