| 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..0c0d9068ecfee16a76d74a0d8cb8d0ffab28f1a6 100644
|
| --- a/content/shell/app/shell_crash_reporter_client.cc
|
| +++ b/content/shell/app/shell_crash_reporter_client.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "content/shell/app/shell_crash_reporter_client.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/command_line.h"
|
| #include "base/files/file_path.h"
|
| #include "base/strings/string16.h"
|
| @@ -23,7 +25,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,12 +50,22 @@ base::FilePath ShellCrashReporterClient::GetReporterLogFilename() {
|
| }
|
| #endif
|
|
|
| +#if defined(OS_WIN)
|
| +bool ShellCrashReporterClient::GetCrashDumpLocation(base::string16* crash_dir) {
|
| +#else
|
| bool ShellCrashReporterClient::GetCrashDumpLocation(base::FilePath* crash_dir) {
|
| +#endif
|
| if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kCrashDumpsDir))
|
| return false;
|
| - *crash_dir = base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
|
| - switches::kCrashDumpsDir);
|
| + base::FilePath crash_directory =
|
| + base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
|
| + switches::kCrashDumpsDir);
|
| +#if defined(OS_WIN)
|
| + *crash_dir = crash_directory.value();
|
| +#else
|
| + *crash_dir = std::move(crash_directory);
|
| +#endif
|
| return true;
|
| }
|
|
|
|
|