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

Use FILE_PATH_LITERAL instead of AppendASCII

Browse source
This commit is contained in:
Cheng Zhao 2015-01-23 21:12:45 -08:00
parent 54ab6744f1
commit 76fc62808c
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
atom/common/node_bindings.cc
View file

@ -147,15 +147,16 @@ void NodeBindings::Initialize() {
node::Environment* NodeBindings::CreateEnvironment( node::Environment* NodeBindings::CreateEnvironment(
v8::Handle<v8::Context> context) { v8::Handle<v8::Context> context) {
CommandLine* command_line = CommandLine::ForCurrentProcess();
std::vector<std::string> args = std::vector<std::string> args =
#if defined(OS_WIN) #if defined(OS_WIN)
String16VectorToStringVector(CommandLine::ForCurrentProcess()->argv()); String16VectorToStringVector(command_line->argv());
#else #else
CommandLine::ForCurrentProcess()->argv(); command_line->argv();
#endif #endif
// Feed node the path to initialization script. // 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); PathService::Get(base::FILE_EXE, &exec_path);
base::FilePath resources_path = base::FilePath resources_path =
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
@ -163,13 +164,14 @@ node::Environment* NodeBindings::CreateEnvironment(
exec_path.DirName().DirName().DirName().DirName().DirName() exec_path.DirName().DirName().DirName().DirName().DirName()
.Append("Resources"); .Append("Resources");
#else #else
exec_path.DirName().AppendASCII("resources"); exec_path.DirName().Append(FILE_PATH_LITERAL("resources"));
#endif #endif
base::FilePath script_path = base::FilePath script_path =
resources_path.AppendASCII("atom") resources_path.Append(FILE_PATH_LITERAL("atom"))
.AppendASCII(is_browser_ ? "browser" : "renderer") .Append(is_browser_ ? FILE_PATH_LITERAL("browser") :
.AppendASCII("lib") FILE_PATH_LITERAL("renderer"))
.AppendASCII("init.js"); .Append(FILE_PATH_LITERAL("lib"))
.Append(FILE_PATH_LITERAL("init.js"));
std::string script_path_str = script_path.AsUTF8Unsafe(); std::string script_path_str = script_path.AsUTF8Unsafe();
args.insert(args.begin() + 1, script_path_str.c_str()); args.insert(args.begin() + 1, script_path_str.c_str());