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

migrate off QuitCurrent*Deprecated in browser.cc

Browse source 
modelled after 1096475 and 1096475
This commit is contained in:
Jeremy Apthorp 2018-10-03 14:47:00 -07:00
parent 98829aa916
commit f5eaa97d9d
4 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/browser.cc
View file

@ -6,6 +6,7 @@
#include <memory>
#include <string>
#include <utility>
#include "atom/browser/atom_browser_main_parts.h"
#include "atom/browser/browser_observer.h"
@ -14,6 +15,7 @@
#include "atom/browser/window_list.h"
#include "base/files/file_util.h"
#include "base/message_loop/message_loop.h"
#include "base/no_destructor.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/threading/thread_restrictions.h"
@ -23,6 +25,9 @@
namespace atom {
// Null until/unless the default main message loop is running.
base::NoDestructor<base::OnceClosure> g_quit_main_message_loop;
Browser::LoginItemSettings::LoginItemSettings() = default;
Browser::LoginItemSettings::~LoginItemSettings() = default;
Browser::LoginItemSettings::LoginItemSettings(const LoginItemSettings& other) =
@ -90,9 +95,8 @@ void Browser::Shutdown() {
for (BrowserObserver& observer : observers_)
observer.OnQuit();
if (base::ThreadTaskRunnerHandle::IsSet()) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::RunLoop::QuitCurrentWhenIdleClosureDeprecated());
if (*g_quit_main_message_loop) {
std::move(*g_quit_main_message_loop).Run();
} else {
// There is no message loop available so we are in early stage.
exit(0);
@ -191,6 +195,10 @@ void Browser::PreMainMessageLoopRun() {
}
}
void Browser::SetMainMessageLoopQuitClosure(base::OnceClosure quit_closure) {
*g_quit_main_message_loop = std::move(quit_closure);
}
void Browser::NotifyAndShutdown() {
if (is_shutdown_)
return;