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

content::RESULT_CODE_NORMAL_EXIT -> service_manager::RESULT_CODE_NORMAL_EXIT

Browse source
This commit is contained in:
Jeremy Apthorp 2018-09-14 17:18:46 -07:00 • committed by Aleksei Kuzmin
parent 948fe2107e
commit 08265ba3e2
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/atom_browser_main_parts.cc
View file

@ -115,14 +115,14 @@ void AtomBrowserMainParts::RegisterDestructionCallback(
int AtomBrowserMainParts::PreEarlyInitialization() { int AtomBrowserMainParts::PreEarlyInitialization() {
const int result = brightray::BrowserMainParts::PreEarlyInitialization(); const int result = brightray::BrowserMainParts::PreEarlyInitialization();
if (result != content::RESULT_CODE_NORMAL_EXIT) if (result != service_manager::RESULT_CODE_NORMAL_EXIT)
return result; return result;
#if defined(OS_POSIX) #if defined(OS_POSIX)
HandleSIGCHLD(); HandleSIGCHLD();
#endif #endif
return content::RESULT_CODE_NORMAL_EXIT; return service_manager::RESULT_CODE_NORMAL_EXIT;
} }
void AtomBrowserMainParts::PostEarlyInitialization() { void AtomBrowserMainParts::PostEarlyInitialization() {

2
brightray/browser/browser_main_parts.cc
View file

@ -215,7 +215,7 @@ int BrowserMainParts::PreEarlyInitialization() {
ui::SetX11ErrorHandlers(nullptr, nullptr); ui::SetX11ErrorHandlers(nullptr, nullptr);
#endif #endif
return content::RESULT_CODE_NORMAL_EXIT; return service_manager::RESULT_CODE_NORMAL_EXIT;
} }
void BrowserMainParts::ToolkitInitialized() { void BrowserMainParts::ToolkitInitialized() {