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

Implement Relaunch on Windows

Browse source
This commit is contained in:
Cheng Zhao 2016-06-02 19:49:36 +09:00
parent a3f39e9d0b
commit 0646f6ea9e
10 changed files with 179 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/common/atom_command_line.cc
View file

@ -12,6 +12,11 @@ namespace atom {
// static
std::vector<std::string> AtomCommandLine::argv_;
#if defined(OS_WIN)
// static
std::vector<std::wstring> AtomCommandLine::wargv_;
#endif
// static
void AtomCommandLine::Init(int argc, const char* const* argv) {
// Hack around with the argv pointer. Used for process.title = "blah"
@ -21,6 +26,15 @@ void AtomCommandLine::Init(int argc, const char* const* argv) {
}
}
#if defined(OS_WIN)
// static
void AtomCommandLine::InitW(int argc, const wchar_t* const* argv) {
for (int i = 0; i < argc; ++i) {
wargv_.push_back(argv[i]);
}
}
#endif
#if defined(OS_LINUX)
// static
void AtomCommandLine::InitializeFromCommandLine() {

9
atom/common/atom_command_line.h
View file

@ -19,6 +19,11 @@ class AtomCommandLine {
static void Init(int argc, const char* const* argv);
static std::vector<std::string> argv() { return argv_; }
#if defined(OS_WIN)
static void InitW(int argc, const wchar_t* const* argv);
static std::vector<std::wstring> wargv() { return wargv_; }
#endif
#if defined(OS_LINUX)
// On Linux the command line has to be read from base::CommandLine since
// it is using zygote.
@ -28,6 +33,10 @@ class AtomCommandLine {
private:
static std::vector<std::string> argv_;
#if defined(OS_WIN)
static std::vector<std::wstring> wargv_;
#endif
DISALLOW_IMPLICIT_CONSTRUCTORS(AtomCommandLine);
};