Fix Windows compiler errors
authorKevin Sawicki <kevin@github.com>
Wed, 5 Oct 2016 23:55:13 +0000 (16:55 -0700)
committerKevin Sawicki <kevinsawicki@gmail.com>
Thu, 6 Oct 2016 16:02:03 +0000 (09:02 -0700)
atom/common/crash_reporter/crash_reporter.cc
atom/common/crash_reporter/win/crash_service_main.cc

index 5b621c793f33baf07c51e3d743821349e59ed283..30b3852a6902405cb8d7a7487e69c40228ebb5f6 100644 (file)
@@ -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) {
index c672c0e6209b9bd08537170a53f91d9cc97a59b9..abeb2c1060e894a38d15e071a659bef29c5341d8 100644 (file)
@@ -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