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

implemetation of AtomCommandline to preserve args

Browse source
This commit is contained in:
deepak1556 2015-03-17 18:25:53 +05:30 • committed by Robo
parent 8aae7c4440
commit 399f47ef0f
12 changed files with 104 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

22
atom/common/node_bindings.cc
View file

@ -7,6 +7,7 @@
#include <string>
#include <vector>
#include "atom/app/atom_main_args.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "base/command_line.h"
#include "base/base_paths.h"
@ -97,22 +98,12 @@ void UvNoOp(uv_async_t* handle) {
scoped_ptr<const char*[]> StringVectorToArgArray(
const std::vector<std::string>& vector) {
scoped_ptr<const char*[]> array(new const char*[vector.size()]);
for (size_t i = 0; i < vector.size(); ++i)
for (size_t i = 0; i < vector.size(); ++i) {
array[i] = vector[i].c_str();
}
return array.Pass();
}
#if defined(OS_WIN)
std::vector<std::string> String16VectorToStringVector(
const std::vector<base::string16>& vector) {
std::vector<std::string> utf8_vector;
utf8_vector.reserve(vector.size());
for (size_t i = 0; i < vector.size(); ++i)
utf8_vector.push_back(base::UTF16ToUTF8(vector[i]));
return utf8_vector;
}
#endif
base::FilePath GetResourcesPath(base::CommandLine* command_line,
bool is_browser) {
base::FilePath exec_path(command_line->argv()[0]);
@ -167,13 +158,8 @@ void NodeBindings::Initialize() {
node::Environment* NodeBindings::CreateEnvironment(
v8::Handle<v8::Context> context) {
auto args = AtomCommandLine::argv();
auto command_line = base::CommandLine::ForCurrentProcess();
std::vector<std::string> args =
#if defined(OS_WIN)
String16VectorToStringVector(command_line->argv());
#else
command_line->argv();
#endif
// Feed node the path to initialization script.
base::FilePath::StringType process_type = is_browser_ ?