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

chore: change return type of platform_util::SetLoginItemEnabled (#15854)

Browse source
This commit is contained in:
Shelley Vohr 2018-11-27 23:16:53 -05:00 • committed by GitHub
parent 5f9c857eb0
commit 73fbb69c50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/browser_mac.mm
View file

@ -278,7 +278,9 @@ void RemoveFromLoginItems() {
void Browser::SetLoginItemSettings(LoginItemSettings settings) { void Browser::SetLoginItemSettings(LoginItemSettings settings) {
#if defined(MAS_BUILD) #if defined(MAS_BUILD)
platform_util::SetLoginItemEnabled(settings.open_at_login); if (!platform_util::SetLoginItemEnabled(settings.open_at_login)) {
LOG(ERROR) << "Unable to set login item enabled on sandboxed app.";
}
#else #else
if (settings.open_at_login) if (settings.open_at_login)
base::mac::AddToLoginItems(settings.open_as_hidden); base::mac::AddToLoginItems(settings.open_as_hidden);

2
atom/common/platform_util.h
View file

@ -61,7 +61,7 @@ void Beep();
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
bool GetLoginItemEnabled(); bool GetLoginItemEnabled();
void SetLoginItemEnabled(bool enabled); bool SetLoginItemEnabled(bool enabled);
#endif #endif
#if defined(OS_LINUX) #if defined(OS_LINUX)

4
atom/common/platform_util_mac.mm
View file

@ -199,9 +199,9 @@ bool GetLoginItemEnabled() {
return enabled; return enabled;
} }
void SetLoginItemEnabled(bool enabled) { bool SetLoginItemEnabled(bool enabled) {
NSString* identifier = GetLoginHelperBundleIdentifier(); NSString* identifier = GetLoginHelperBundleIdentifier();
SMLoginItemSetEnabled((__bridge CFStringRef)identifier, enabled); return SMLoginItemSetEnabled((__bridge CFStringRef)identifier, enabled);
} }
} // namespace platform_util } // namespace platform_util