From 84b7bb29f03367b29dfc594219ae7021babe4243 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 5 Oct 2016 16:55:13 -0700 Subject: [PATCH] Fix Windows compiler errors --- atom/common/crash_reporter/crash_reporter.cc | 3 ++- atom/common/crash_reporter/win/crash_service_main.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc index 5b621c793f..30b3852a69 100644 --- a/atom/common/crash_reporter/crash_reporter.cc +++ b/atom/common/crash_reporter/crash_reporter.cc @@ -11,6 +11,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "content/public/common/content_switches.h" +#include "base/strings/utf_string_conversions.h" namespace crash_reporter { @@ -37,7 +38,7 @@ void CrashReporter::Start(const std::string& product_name, base::FilePath CrashReporter::GetCrashesDirectory( const std::string& product_name, const base::FilePath& temp_path) { - return temp_path.Append(product_name + " Crashes"); + return temp_path.Append(base::UTF8ToUTF16(product_name + " Crashes")); } void CrashReporter::SetUploadParameters(const StringMap& parameters) { diff --git a/atom/common/crash_reporter/win/crash_service_main.cc b/atom/common/crash_reporter/win/crash_service_main.cc index c672c0e620..abeb2c1060 100644 --- a/atom/common/crash_reporter/win/crash_service_main.cc +++ b/atom/common/crash_reporter/win/crash_service_main.cc @@ -63,7 +63,7 @@ int Main(const wchar_t* cmd) { // We use/create a directory under the user's temp folder, for logging. base::FilePath operating_dir( cmd_line.GetSwitchValueNative(kCrashesDirectory)); - GetCrashServiceDirectory(operating_dir); + CreateCrashServiceDirectory(operating_dir); base::FilePath log_file = operating_dir.Append(kStandardLogFile); // Logging to stderr (to help with debugging failures on the