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

Remove the need for ProcessSingletonStartupLock

Browse source
This commit is contained in:
Cheng Zhao 2015-10-22 17:12:09 +08:00
parent 70e74d05e0
commit afc1fff792
5 changed files with 16 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,12 +112,20 @@ int GetPathConstant(const std::string& name) {
return -1;
}
// Run the NotificationCallback and returns whether browser is shuting down.
bool NotificationCallbackWrapper(
const ProcessSingleton::NotificationCallback& callback,
const base::CommandLine& command_line,
const base::FilePath& current_directory) {
callback.Run(command_line, current_directory);
const base::CommandLine& cmd,
const base::FilePath& cwd) {
// Make sure the callback is called after app gets ready.
if (Browser::Get()->is_ready()) {
callback.Run(cmd, cwd);
} else {
scoped_refptr<base::SingleThreadTaskRunner> task_runner(
base::ThreadTaskRunnerHandle::Get());
task_runner->PostTask(
FROM_HERE, base::Bind(base::IgnoreResult(callback), cmd, cwd));
}
// ProcessSingleton needs to know whether current process is quiting.
return !Browser::Get()->is_shutting_down();
}
@ -202,9 +210,6 @@ void App::OnFinishLaunching() {
auto handle = Session::CreateFrom(isolate(), browser_context);
default_session_.Reset(isolate(), handle.ToV8());
if (process_singleton_startup_lock_.get())
process_singleton_startup_lock_->Unlock();
Emit("ready");
}
@ -293,24 +298,14 @@ bool App::MakeSingleInstance(
base::FilePath user_dir;
PathService::Get(brightray::DIR_USER_DATA, &user_dir);
process_singleton_startup_lock_.reset(
new ProcessSingletonStartupLock(
base::Bind(NotificationCallbackWrapper, callback)));
process_singleton_.reset(
new ProcessSingleton(
user_dir,
process_singleton_startup_lock_->AsNotificationCallback()));
if (Browser::Get()->is_ready())
process_singleton_startup_lock_->Unlock();
process_singleton_.reset(new ProcessSingleton(
user_dir, base::Bind(NotificationCallbackWrapper, callback)));
switch (process_singleton_->NotifyOtherProcessOrCreate()) {
case ProcessSingleton::NotifyResult::LOCK_ERROR:
case ProcessSingleton::NotifyResult::PROFILE_IN_USE:
case ProcessSingleton::NotifyResult::PROCESS_NOTIFIED:
process_singleton_.reset();
process_singleton_startup_lock_.reset();
return true;
case ProcessSingleton::NotifyResult::PROCESS_NONE:
default: // Shouldn't be needed, but VS warns if it is not there.