From 76fc62808c5610084e4f7fe34cbbe01a8d1d9558 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 23 Jan 2015 21:12:45 -0800 Subject: [PATCH] Use FILE_PATH_LITERAL instead of AppendASCII --- atom/common/node_bindings.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc index 6f2d76218ff1..042117c0ff48 100644 --- a/atom/common/node_bindings.cc +++ b/atom/common/node_bindings.cc @@ -147,15 +147,16 @@ void NodeBindings::Initialize() { node::Environment* NodeBindings::CreateEnvironment( v8::Handle context) { + CommandLine* command_line = CommandLine::ForCurrentProcess(); std::vector args = #if defined(OS_WIN) - String16VectorToStringVector(CommandLine::ForCurrentProcess()->argv()); + String16VectorToStringVector(command_line->argv()); #else - CommandLine::ForCurrentProcess()->argv(); + command_line->argv(); #endif // Feed node the path to initialization script. - base::FilePath exec_path(CommandLine::ForCurrentProcess()->argv()[0]); + base::FilePath exec_path(command_line->argv()[0]); PathService::Get(base::FILE_EXE, &exec_path); base::FilePath resources_path = #if defined(OS_MACOSX) @@ -163,13 +164,14 @@ node::Environment* NodeBindings::CreateEnvironment( exec_path.DirName().DirName().DirName().DirName().DirName() .Append("Resources"); #else - exec_path.DirName().AppendASCII("resources"); + exec_path.DirName().Append(FILE_PATH_LITERAL("resources")); #endif base::FilePath script_path = - resources_path.AppendASCII("atom") - .AppendASCII(is_browser_ ? "browser" : "renderer") - .AppendASCII("lib") - .AppendASCII("init.js"); + resources_path.Append(FILE_PATH_LITERAL("atom")) + .Append(is_browser_ ? FILE_PATH_LITERAL("browser") : + FILE_PATH_LITERAL("renderer")) + .Append(FILE_PATH_LITERAL("lib")) + .Append(FILE_PATH_LITERAL("init.js")); std::string script_path_str = script_path.AsUTF8Unsafe(); args.insert(args.begin() + 1, script_path_str.c_str());