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

Fix callback handle usage

Browse Source
This commit is contained in:
Paul Betts
2015-10-19 18:02:54 -07:00
parent 50fab0733b
commit 4a4b829cfc
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
atom/browser/browser.cc
View File

@@ -20,7 +20,7 @@ Browser::Browser()
: is_quiting_(false),
is_ready_(false),
is_shutdown_(false),
process_notify_callback_(NULL) {
process_notify_callback_set_(false) {
WindowList::AddObserver(this);
}
@@ -169,11 +169,13 @@ bool Browser::HandleBeforeQuit() {
}
ProcessSingleton::NotifyResult Browser::GetSingleInstanceResult() {
LOG(ERROR) << "Process Notify Result: " << process_notify_result_;
return process_notify_result_;
}
void Browser::SetSingleInstanceCallback(const ProcessSingleton::NotificationCallback* callback) {
void Browser::SetSingleInstanceCallback(const ProcessSingleton::NotificationCallback& callback) {
process_notify_callback_ = callback;
process_notify_callback_set_ = true;
}
void Browser::OnWindowCloseCancelled(NativeWindow* window) {
@@ -193,8 +195,8 @@ void Browser::OnWindowAllClosed() {
bool Browser::OnProcessSingletonNotification(
const base::CommandLine& command_line,
const base::FilePath& current_directory) {
if (process_notify_callback_) {
return (*process_notify_callback_).Run(command_line, current_directory);
if (process_notify_callback_set_) {
return process_notify_callback_.Run(command_line, current_directory);
} else {
return true; // We'll handle this, not a different process
}