mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix Windows compiler errors

Browse source
This commit is contained in:
Kevin Sawicki 2016-10-05 16:55:13 -07:00 • committed by Kevin Sawicki
parent 9d1d1f21e9
commit 84b7bb29f0
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/common/crash_reporter/crash_reporter.cc
View file

@ -11,6 +11,7 @@
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h" #include "base/strings/string_split.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "base/strings/utf_string_conversions.h"
namespace crash_reporter { namespace crash_reporter {
@ -37,7 +38,7 @@ void CrashReporter::Start(const std::string& product_name,
base::FilePath CrashReporter::GetCrashesDirectory( base::FilePath CrashReporter::GetCrashesDirectory(
const std::string& product_name, const base::FilePath& temp_path) { 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) { void CrashReporter::SetUploadParameters(const StringMap& parameters) {

2
atom/common/crash_reporter/win/crash_service_main.cc
View file

@ -63,7 +63,7 @@ int Main(const wchar_t* cmd) {
// We use/create a directory under the user's temp folder, for logging. // We use/create a directory under the user's temp folder, for logging.
base::FilePath operating_dir( base::FilePath operating_dir(
cmd_line.GetSwitchValueNative(kCrashesDirectory)); cmd_line.GetSwitchValueNative(kCrashesDirectory));
GetCrashServiceDirectory(operating_dir); CreateCrashServiceDirectory(operating_dir);
base::FilePath log_file = operating_dir.Append(kStandardLogFile); base::FilePath log_file = operating_dir.Append(kStandardLogFile);
// Logging to stderr (to help with debugging failures on the // Logging to stderr (to help with debugging failures on the