github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7053 from electron/launch-from-notification

Browse Source 
Send notification info to app.ready, on macOS
This commit is contained in:
Cheng Zhao
2016-09-09 20:01:39 +09:00
committed by GitHub
parent 693ba1375b 32e0e8a151
commit b6079ff90b
8 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -489,8 +489,8 @@ void App::OnWillFinishLaunching() {
Emit("will-finish-launching");
}
void App::OnFinishLaunching() {
Emit("ready");
void App::OnFinishLaunching(const base::DictionaryValue& launch_info) {
Emit("ready", launch_info);
}
void App::OnAccessibilitySupportChanged() {

2
atom/browser/api/atom_api_app.h
View File

@@ -73,7 +73,7 @@ class App : public AtomBrowserClient::Delegate,
void OnOpenURL(const std::string& url) override;
void OnActivate(bool has_visible_windows) override;
void OnWillFinishLaunching() override;
void OnFinishLaunching() override;
void OnFinishLaunching(const base::DictionaryValue& launch_info) override;
void OnLogin(LoginHandler* login_handler,
const base::DictionaryValue& request_details) override;
void OnAccessibilitySupportChanged() override;