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

Add getLoginItemLaunchStatus API

Browse source
This commit is contained in:
Kevin Sawicki 2016-07-06 11:43:44 -07:00
parent d42d10a47c
commit 98a97a52ea
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_app.cc
View file

@ -527,8 +527,8 @@ void App::BuildPrototype(
.SetMethod("show", base::Bind(&Browser::Show, browser)) .SetMethod("show", base::Bind(&Browser::Show, browser))
.SetMethod("setUserActivity", .SetMethod("setUserActivity",
base::Bind(&Browser::SetUserActivity, browser)) base::Bind(&Browser::SetUserActivity, browser))
.SetMethod("getCurrentActivityType", .SetMethod("getLoginItemLaunchStatus",
base::Bind(&Browser::GetCurrentActivityType, browser)) base::Bind(&Browser::GetLoginItemLaunchStatus, browser))
#endif #endif
#if defined(OS_WIN) #if defined(OS_WIN)
.SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser)) .SetMethod("setUserTasks", base::Bind(&Browser::SetUserTasks, browser))

2
atom/browser/browser.h
View file

@ -134,6 +134,8 @@ class Browser : public WindowListObserver {
// Set docks' icon. // Set docks' icon.
void DockSetIcon(const gfx::Image& image); void DockSetIcon(const gfx::Image& image);
v8::Local<v8::Value> GetLoginItemLaunchStatus(mate::Arguments* args);
#endif // defined(OS_MACOSX) #endif // defined(OS_MACOSX)
#if defined(OS_WIN) #if defined(OS_WIN)

10
atom/browser/browser_mac.mm
View file

@ -11,9 +11,11 @@
#include "atom/browser/window_list.h" #include "atom/browser/window_list.h"
#include "base/mac/bundle_locations.h" #include "base/mac/bundle_locations.h"
#include "base/mac/foundation_util.h" #include "base/mac/foundation_util.h"
#include "base/mac/mac_util.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "brightray/common/application_info.h" #include "brightray/common/application_info.h"
#include "native_mate/dictionary.h"
#include "net/base/mac/url_conversions.h" #include "net/base/mac/url_conversions.h"
#include "url/gurl.h" #include "url/gurl.h"
@ -148,6 +150,14 @@ bool Browser::ContinueUserActivity(const std::string& type,
return prevent_default; return prevent_default;
} }
v8::Local<v8::Value> Browser::GetLoginItemLaunchStatus(mate::Arguments* args) {
mate::Dictionary dict = mate::Dictionary::CreateEmpty(args->isolate());
dict.Set("loginItem", base::mac::WasLaunchedAsLoginOrResumeItem());
dict.Set("hidden", base::mac::WasLaunchedAsHiddenLoginItem());
dict.Set("restoreState", base::mac::WasLaunchedAsLoginItemRestoreState());
return dict.GetHandle();
}
std::string Browser::GetExecutableFileVersion() const { std::string Browser::GetExecutableFileVersion() const {
return brightray::GetApplicationVersion(); return brightray::GetApplicationVersion();
} }