mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
8f5fdc1f9a
To avoid conflicting IDs between Alloy (which uses cef.pak) and Chrome (which uses chrome_100_percent.pak) the cef/LICENSE.txt file is now included in both cef/libcef/resources/cef_resources.grd and chrome/app/theme/chrome_unscaled_resources.grd with different ID values. The cef.pak file currently contains both CEF-specific resources and Chrome resources that are already included in the default *.pak files distributed with Chrome. In the future we should remove this duplication and just distribute the same *.pak files as Chrome for the majority of resources.
156 lines
6.8 KiB
Diff
156 lines
6.8 KiB
Diff
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 @@
|
|
</if>
|
|
</if>
|
|
<if expr="not _google_chrome">
|
|
+ <include name="IDR_CHROME_CEF_LICENSE_TXT" file="../../../cef/LICENSE.txt" type="BINDATA" />
|
|
<include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" type="BINDATA" />
|
|
<include name="IDR_PRODUCT_LOGO_128" file="chromium/product_logo_128.png" type="BINDATA" />
|
|
<include name="IDR_PRODUCT_LOGO_256" file="chromium/product_logo_256.png" type="BINDATA" />
|
|
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/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 @@ getDisplayedAlertsForProfileId:(NSString*)profileId
|
|
- (id<NotificationDelivery>)serviceProxy {
|
|
id<NotificationDelivery> 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());
|