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

First pass at auto-launch supporting Squirrel.

Browse source
This commit is contained in:
Charlie Hess 2017-01-23 19:24:50 -08:00 • committed by Kevin Sawicki
parent 093b844859
commit 39b6bcb621
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/browser.h
View file

@ -98,6 +98,7 @@ class Browser : public WindowListObserver {
bool restore_state = false; bool restore_state = false;
bool opened_at_login = false; bool opened_at_login = false;
bool opened_as_hidden = false; bool opened_as_hidden = false;
mate::Arguments* start_args;
}; };
void SetLoginItemSettings(LoginItemSettings settings); void SetLoginItemSettings(LoginItemSettings settings);
LoginItemSettings GetLoginItemSettings(); LoginItemSettings GetLoginItemSettings();

31
atom/browser/browser_win.cc
View file

@ -257,10 +257,32 @@ void Browser::SetLoginItemSettings(LoginItemSettings settings) {
base::win::RegKey key(HKEY_CURRENT_USER, keyPath.c_str(), KEY_ALL_ACCESS); base::win::RegKey key(HKEY_CURRENT_USER, keyPath.c_str(), KEY_ALL_ACCESS);
if (settings.open_at_login) { if (settings.open_at_login) {
base::FilePath path; base::FilePath appDir, execPath;
if (PathService::Get(base::FILE_EXE, &path)) { if (PathService::Get(base::DIR_EXE, &appDir) &&
base::string16 exePath(path.value()); PathService::Get(base::FILE_EXE, &execPath)) {
key.WriteValue(GetAppUserModelID(), exePath.c_str()); base::FilePath updatePath = appDir.Append(
FILE_PATH_LITERAL("..\\Update.exe"));
base::string16 updateDotExe(updatePath.value());
base::string16 appName(execPath.BaseName().value());
if (GetFileAttributesW(updateDotExe.c_str()) != INVALID_FILE_ATTRIBUTES) {
base::string16* args = base::StringPrintf(L" --processStart \"%s\"",
appName.c_str());
std::vector<base::string16> startArgs;
if (settings.start_args->GetNext(&startArgs) && !startArgs.empty()) {
args += base::StringPrintf(L" --process-start-args \"%s\"",
base::JoinString(startArgs, L" "));
}
base::string16* regEntry = base::StringPrintf(L"\"%s\" %s \"%%1\"",
updateDotExe.c_str(),
args.c_str());
key.WriteValue(GetAppUserModelID(), regEntry.c_str());
} else {
// TODO(charliehess): No Update.exe found, Windows Store build?
}
} }
} else { } else {
key.DeleteValue(GetAppUserModelID()); key.DeleteValue(GetAppUserModelID());
@ -284,7 +306,6 @@ Browser::LoginItemSettings Browser::GetLoginItemSettings() {
return settings; return settings;
} }
PCWSTR Browser::GetAppUserModelID() { PCWSTR Browser::GetAppUserModelID() {
if (app_user_model_id_.empty()) { if (app_user_model_id_.empty()) {
SetAppUserModelID(base::ReplaceStringPlaceholders( SetAppUserModelID(base::ReplaceStringPlaceholders(