Chromium Code Reviews| 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..9e987a79c1fd635e913ae4615431fb2010890a79 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,12 +48,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 = crash_directory; |
|
grt (UTC plus 2)
2016/06/02 12:55:33
#include <utility>
*crash_dir = std::move(crash_d
ananta
2016/06/02 20:34:20
Done. Left the OS_WIN part as is
|
| +#endif |
| return true; |
| } |