mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-16 12:10:41 +01:00
Fix patched chrome build with enable_cef=false
This commit is contained in:
parent
4d32741e1b
commit
877cbe7e04
@ -102,7 +102,7 @@ index 49993fbc333f8..c39e8743e281e 100644
|
||||
// content::ContentMainDelegate:
|
||||
absl::optional<int> BasicStartupComplete() override;
|
||||
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
|
||||
index 2893df3488d8f..f754fc076932f 100644
|
||||
index 2893df3488d8f..4ad86fb7a2bb0 100644
|
||||
--- chrome/browser/chrome_browser_main.cc
|
||||
+++ chrome/browser/chrome_browser_main.cc
|
||||
@@ -51,6 +51,7 @@
|
||||
@ -113,24 +113,6 @@ index 2893df3488d8f..f754fc076932f 100644
|
||||
#include "chrome/browser/about_flags.h"
|
||||
#include "chrome/browser/active_use_util.h"
|
||||
#include "chrome/browser/after_startup_task_utils.h"
|
||||
@@ -1390,7 +1391,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
||||
CHECK(aura::Env::GetInstance());
|
||||
#endif // defined(USE_AURA)
|
||||
|
||||
-#if BUILDFLAG(ENABLE_PROCESS_SINGLETON)
|
||||
+#if BUILDFLAG(ENABLE_PROCESS_SINGLETON) && !BUILDFLAG(ENABLE_CEF)
|
||||
if (!ChromeProcessSingleton::IsEarlySingletonFeatureEnabled()) {
|
||||
// When another process is running, use that process instead of starting a
|
||||
// new one. NotifyOtherProcess will currently give the other process up to
|
||||
@@ -1429,7 +1430,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
||||
return chrome::RESULT_CODE_PROFILE_IN_USE;
|
||||
}
|
||||
}
|
||||
-#endif // BUILDFLAG(ENABLE_PROCESS_SINGLETON)
|
||||
+#endif // BUILDFLAG(ENABLE_PROCESS_SINGLETON) && !BUILDFLAG(ENABLE_CEF)
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
// We must call DoUpgradeTasks now that we own the browser singleton to
|
||||
@@ -1475,7 +1476,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
||||
}
|
||||
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
Loading…
x
Reference in New Issue
Block a user