github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-28 16:58:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

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() {
const int result = brightray::BrowserMainParts::PreEarlyInitialization();
if (result != content::RESULT_CODE_NORMAL_EXIT)
if (result != service_manager::RESULT_CODE_NORMAL_EXIT)
return result;
#if defined(OS_POSIX)
HandleSIGCHLD();
#endif
return content::RESULT_CODE_NORMAL_EXIT;
return service_manager::RESULT_CODE_NORMAL_EXIT;
}
void AtomBrowserMainParts::PostEarlyInitialization() {

2
brightray/browser/browser_main_parts.cc
View File

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