diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc index db85b6b2fcf5..bcf6867e8f4e 100644 --- chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc @@ -28,6 +28,7 @@ #include "base/trace_event/trace_event_impl.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/chrome_resource_bundle_helper.h" #include "chrome/browser/defaults.h" @@ -381,6 +382,8 @@ struct MainFunction { // Initializes the user data dir. Must be called before InitializeLocalState(). void InitializeUserDataDir(base::CommandLine* command_line) { + if (cef::IsChromeRuntimeEnabled()) + return; #if defined(OS_WIN) // Reach out to chrome_elf for the truth on the user data directory. // Note that in tests, this links to chrome_elf_test_stubs. @@ -658,7 +661,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() { } #if defined(OS_WIN) + if (!cef::IsChromeRuntimeEnabled()) { SetUpExtendedCrashReporting(is_browser_process); + } base::sequence_manager::internal::ThreadControllerPowerMonitor:: InitializeOnMainThread(); #endif @@ -943,6 +948,7 @@ void ChromeMainDelegate::PreSandboxStartup() { std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); + if (!cef::IsChromeRuntimeEnabled()) { crash_reporter::InitializeCrashKeys(); #if defined(OS_POSIX) @@ -953,6 +959,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitMacCrashReporter(command_line, process_type); SetUpInstallerPreferences(command_line); #endif + } // !cef::IsChromeRuntimeEnabled() #if defined(OS_WIN) child_process_logging::Init(); @@ -1075,6 +1082,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } + if (!cef::IsChromeRuntimeEnabled()) { #if defined(OS_POSIX) && !defined(OS_MAC) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { @@ -1107,6 +1115,7 @@ void ChromeMainDelegate::PreSandboxStartup() { // After all the platform Breakpads have been initialized, store the command // line for crash reporting. crash_keys::SetCrashKeysFromCommandLine(command_line); + } // !cef::IsChromeRuntimeEnabled() #if BUILDFLAG(ENABLE_PDF) MaybeInitializeGDI(); @@ -1205,6 +1214,7 @@ void ChromeMainDelegate::ZygoteForked() { SetUpProfilingShutdownHandler(); } + if (!cef::IsChromeRuntimeEnabled()) { // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets // this up for the browser process in a different manner. const base::CommandLine* command_line = @@ -1221,6 +1231,7 @@ void ChromeMainDelegate::ZygoteForked() { // Reset the command line for the newly spawned process. crash_keys::SetCrashKeysFromCommandLine(*command_line); + } // !cef::IsChromeRuntimeEnabled() } #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) diff --git chrome/app/theme/chrome_unscaled_resources.grd chrome/app/theme/chrome_unscaled_resources.grd index b4e4545e3520..29335f1614e2 100644 --- chrome/app/theme/chrome_unscaled_resources.grd +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -62,6 +62,7 @@ + diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc index fee4d5f1a8ca..2e4fb506d851 100644 --- chrome/browser/chrome_browser_main.cc +++ chrome/browser/chrome_browser_main.cc @@ -49,6 +49,7 @@ #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "cc/base/switches.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/active_use_util.h" #include "chrome/browser/after_startup_task_utils.h" @@ -902,8 +903,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { #if !defined(OS_ANDROID) // Create the RunLoop for MainMessageLoopRun() to use, and pass a copy of // its QuitClosure to the BrowserProcessImpl to call when it is time to exit. + // CEF with the Chrome runtime will create and manage its own RunLoop. DCHECK(!g_run_loop); - g_run_loop = new base::RunLoop; + if (!cef::IsChromeRuntimeEnabled()) + g_run_loop = new base::RunLoop; // These members must be initialized before returning from this function. // Android doesn't use StartupBrowserCreator. @@ -1634,11 +1637,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // This step is costly and is already measured in // Startup.StartupBrowserCreator_Start. // See the comment above for an explanation of |process_command_line|. + // Bypass StartupBrowserCreator with CEF where |g_run_loop| is nullptr. const bool started = + !g_run_loop || !process_command_line || browser_creator_->Start(parsed_command_line(), base::FilePath(), profile_, last_opened_profiles); - if (started) { + if (started && g_run_loop) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm index c30b73c2575f..5da45a243f9b 100644 --- chrome/browser/chrome_browser_main_mac.mm +++ chrome/browser/chrome_browser_main_mac.mm @@ -16,6 +16,7 @@ #include "base/path_service.h" #include "base/strings/sys_string_conversions.h" #include "build/branding_buildflags.h" +#include "cef/libcef/features/features.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/apps/app_shim/app_shim_listener.h" #include "chrome/browser/browser_process.h" @@ -111,6 +112,7 @@ } } +#if !BUILDFLAG(ENABLE_CEF) // Create the app delegate. This object is intentionally leaked as a global // singleton. It is accessed through -[NSApp delegate]. AppController* app_controller = [[AppController alloc] init]; @@ -119,6 +121,7 @@ chrome::BuildMainMenu(NSApp, app_controller, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false); [app_controller mainMenuCreated]; +#endif // BUILDFLAG(ENABLE_CEF) PrefService* local_state = g_browser_process->local_state(); DCHECK(local_state); @@ -175,7 +178,9 @@ } void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { +#if !BUILDFLAG(ENABLE_CEF) AppController* appController = base::mac::ObjCCastStrict([NSApp delegate]); [appController didEndMainMessageLoop]; +#endif } diff --git chrome/browser/notifications/notification_platform_bridge_mac.mm chrome/browser/notifications/notification_platform_bridge_mac.mm index 9e8fcb9f9f91..2a9eaca0fb0d 100644 --- chrome/browser/notifications/notification_platform_bridge_mac.mm +++ chrome/browser/notifications/notification_platform_bridge_mac.mm @@ -24,6 +24,7 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/browser_features.h" #include "chrome/browser/notifications/notification_common.h" #include "chrome/browser/notifications/notification_display_service_impl.h" @@ -451,6 +452,12 @@ - (void)notificationClick:(NSDictionary*)notificationResponseData { - (id)serviceProxy { id proxy = [_xpcConnection remoteObjectProxy]; + // Skip exception port configuration when running CEF with crash reporting disabled. + if (!_setExceptionPort && cef::IsChromeRuntimeEnabled() && + !cef::IsCrashReportingEnabled()) { + _setExceptionPort = YES; + } + if (!_setExceptionPort) { base::mac::ScopedMachSendRight exceptionPort( crash_reporter::GetCrashpadClient().GetHandlerMachPort());