2020-07-06 20:14:57 +02:00
|
|
|
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
|
2024-10-24 17:05:31 +02:00
|
|
|
index 2fb2eb68d328b..f616ba827ea03 100644
|
2020-07-06 20:14:57 +02:00
|
|
|
--- chrome/app/chrome_main_delegate.cc
|
|
|
|
+++ chrome/app/chrome_main_delegate.cc
|
2024-08-26 14:44:25 +02:00
|
|
|
@@ -42,6 +42,7 @@
|
2020-07-06 20:14:57 +02:00
|
|
|
#include "base/trace_event/trace_event_impl.h"
|
|
|
|
#include "build/build_config.h"
|
2021-01-28 00:13:12 +01:00
|
|
|
#include "build/chromeos_buildflags.h"
|
2024-07-05 19:07:07 +02:00
|
|
|
+#include "cef/libcef/features/features.h"
|
2023-04-26 21:55:59 +02:00
|
|
|
#include "chrome/browser/buildflags.h"
|
2020-07-06 20:14:57 +02:00
|
|
|
#include "chrome/browser/chrome_content_browser_client.h"
|
|
|
|
#include "chrome/browser/chrome_resource_bundle_helper.h"
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -574,6 +575,7 @@ struct MainFunction {
|
2024-07-05 19:07:07 +02:00
|
|
|
int (*function)(content::MainFunctionParams);
|
|
|
|
};
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-07-05 19:07:07 +02:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
2020-07-06 20:14:57 +02:00
|
|
|
// Initializes the user data dir. Must be called before InitializeLocalState().
|
|
|
|
void InitializeUserDataDir(base::CommandLine* command_line) {
|
2023-12-06 21:16:15 +01:00
|
|
|
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -657,6 +659,7 @@ void InitializeUserDataDir(base::CommandLine* command_line) {
|
2024-07-05 19:07:07 +02:00
|
|
|
command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir);
|
|
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
}
|
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-10-24 17:05:31 +02:00
|
|
|
#if !BUILDFLAG(IS_ANDROID)
|
|
|
|
void InitLogging(const std::string& process_type) {
|
|
|
|
@@ -789,6 +792,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
|
2022-09-29 18:37:59 +02:00
|
|
|
ChromeMainDelegate::~ChromeMainDelegate() = default;
|
2022-11-15 18:50:53 +01:00
|
|
|
#endif // !BUILDFLAG(IS_ANDROID)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-09-29 18:37:59 +02:00
|
|
|
+void ChromeMainDelegate::CleanupOnUIThread() {
|
2023-04-04 20:00:13 +02:00
|
|
|
+ memory_system_.reset();
|
2022-09-29 18:37:59 +02:00
|
|
|
+}
|
|
|
|
+
|
2024-01-26 03:12:43 +01:00
|
|
|
std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
|
2022-09-29 18:37:59 +02:00
|
|
|
InvokedIn invoked_in) {
|
2023-12-06 21:16:15 +01:00
|
|
|
DUMP_WILL_BE_CHECK(base::ThreadPoolInstance::Get());
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -814,7 +821,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
|
2023-11-29 02:33:44 +01:00
|
|
|
// future session's metrics.
|
|
|
|
DeferBrowserMetrics(user_data_dir);
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-29 02:33:44 +01:00
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
|
|
+#if BUILDFLAG(IS_WIN) && !BUILDFLAG(ENABLE_CEF)
|
|
|
|
// In the case the process is not the singleton process, the uninstall tasks
|
|
|
|
// need to be executed here. A window will be displayed asking to close all
|
|
|
|
// running instances.
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -961,7 +968,8 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-05-03 18:50:23 +02:00
|
|
|
// Initializes the resource bundle and determines the locale.
|
|
|
|
std::string actual_locale = LoadLocalState(
|
|
|
|
- chrome_feature_list_creator, invoked_in_browser->is_running_test);
|
|
|
|
+ chrome_feature_list_creator, GetResourceBundleDelegate(),
|
|
|
|
+ invoked_in_browser->is_running_test);
|
|
|
|
chrome_feature_list_creator->SetApplicationLocale(actual_locale);
|
|
|
|
chrome_feature_list_creator->OverrideCachedUIStrings();
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -978,6 +986,8 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
|
2024-07-05 19:07:07 +02:00
|
|
|
new net::NetworkChangeNotifierFactoryAndroid());
|
|
|
|
#endif
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-07-05 19:07:07 +02:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
|
|
|
+ // Avoid CEF crash with multi-threaded-message-loop.
|
2023-02-27 19:52:38 +01:00
|
|
|
if (base::FeatureList::IsEnabled(
|
|
|
|
features::kWriteBasicSystemProfileToPersistentHistogramsFile)) {
|
2024-07-05 19:07:07 +02:00
|
|
|
bool record = true;
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -988,6 +998,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
|
2024-07-05 19:07:07 +02:00
|
|
|
if (record)
|
|
|
|
chrome_content_browser_client_->startup_data()->RecordCoreSystemProfile();
|
|
|
|
}
|
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-02-27 19:52:38 +01:00
|
|
|
#if BUILDFLAG(IS_ANDROID)
|
2024-07-05 19:07:07 +02:00
|
|
|
UmaSessionStats::OnStartup();
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1031,8 +1042,8 @@ void ChromeMainDelegate::CreateThreadPool(std::string_view name) {
|
2024-09-27 16:15:44 +02:00
|
|
|
std::make_unique<ChromeThreadProfilerClient>());
|
|
|
|
|
2024-07-29 19:09:20 +02:00
|
|
|
// `ChromeMainDelegateAndroid::PreSandboxStartup` creates the profiler a little
|
|
|
|
-// later.
|
|
|
|
-#if !BUILDFLAG(IS_ANDROID)
|
|
|
|
+// later. Same with CEF.
|
|
|
|
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(ENABLE_CEF)
|
|
|
|
// Start the sampling profiler as early as possible - namely, once the thread
|
|
|
|
// pool has been created.
|
|
|
|
sampling_profiler_ = std::make_unique<MainThreadStackSamplingProfiler>();
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1439,6 +1450,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
2020-07-06 20:14:57 +02:00
|
|
|
std::string process_type =
|
|
|
|
command_line.GetSwitchValueASCII(switches::kProcessType);
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-07-05 19:07:07 +02:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
2020-07-06 20:14:57 +02:00
|
|
|
crash_reporter::InitializeCrashKeys();
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-07-05 19:07:07 +02:00
|
|
|
#if BUILDFLAG(IS_POSIX)
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1454,6 +1466,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
|
|
|
if (chrome::ProcessNeedsProfileDir(process_type)) {
|
2024-07-05 19:07:07 +02:00
|
|
|
InitializeUserDataDir(base::CommandLine::ForCurrentProcess());
|
|
|
|
}
|
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-07-05 19:07:07 +02:00
|
|
|
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
|
|
// Generate shared resource file only on browser process. This is to avoid
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1605,7 +1618,8 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
2024-05-03 18:50:23 +02:00
|
|
|
#else
|
|
|
|
const std::string loaded_locale =
|
|
|
|
ui::ResourceBundle::InitSharedInstanceWithLocale(
|
|
|
|
- locale, nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
|
|
|
|
+ locale, GetResourceBundleDelegate(),
|
|
|
|
+ ui::ResourceBundle::LOAD_COMMON_RESOURCES);
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-05-03 18:50:23 +02:00
|
|
|
base::FilePath resources_pack_path;
|
|
|
|
base::PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1635,6 +1649,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
2022-07-25 19:49:32 +02:00
|
|
|
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
|
2020-07-06 20:14:57 +02:00
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-07-05 19:07:07 +02:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
2022-01-25 21:26:51 +01:00
|
|
|
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
|
2020-07-06 20:14:57 +02:00
|
|
|
// Zygote needs to call InitCrashReporter() in RunZygote().
|
2024-07-29 19:09:20 +02:00
|
|
|
if (process_type != switches::kZygoteProcess &&
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1671,6 +1686,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
2020-07-06 20:14:57 +02:00
|
|
|
// After all the platform Breakpads have been initialized, store the command
|
|
|
|
// line for crash reporting.
|
|
|
|
crash_keys::SetCrashKeysFromCommandLine(command_line);
|
2024-07-05 19:07:07 +02:00
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2020-07-06 20:14:57 +02:00
|
|
|
#if BUILDFLAG(ENABLE_PDF)
|
2021-09-20 11:06:23 +02:00
|
|
|
MaybePatchGdiGetFontData();
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1791,6 +1807,7 @@ void ChromeMainDelegate::ZygoteForked() {
|
2020-07-06 20:14:57 +02:00
|
|
|
SetUpProfilingShutdownHandler();
|
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-07-05 19:07:07 +02:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
2020-07-06 20:14:57 +02:00
|
|
|
// 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 =
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1803,6 +1820,7 @@ void ChromeMainDelegate::ZygoteForked() {
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2020-07-06 20:14:57 +02:00
|
|
|
// Reset the command line for the newly spawned process.
|
|
|
|
crash_keys::SetCrashKeysFromCommandLine(*command_line);
|
2024-07-05 19:07:07 +02:00
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2020-07-06 20:14:57 +02:00
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-01-25 21:26:51 +01:00
|
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1913,6 +1931,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
|
2024-05-23 03:52:35 +02:00
|
|
|
: memory_system::DispatcherParameters::
|
|
|
|
AllocationTraceRecorderInclusion::kIgnore;
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-04-04 20:00:13 +02:00
|
|
|
+ memory_system_ = std::make_unique<memory_system::MemorySystem>();
|
|
|
|
memory_system::Initializer()
|
|
|
|
.SetGwpAsanParameters(gwp_asan_boost_sampling, process_type)
|
2024-04-23 22:06:00 +02:00
|
|
|
.SetProfilingClientParameters(chrome::GetChannel(),
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1920,5 +1939,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
|
2024-05-23 03:52:35 +02:00
|
|
|
.SetDispatcherParameters(memory_system::DispatcherParameters::
|
|
|
|
PoissonAllocationSamplerInclusion::kEnforce,
|
|
|
|
allocation_recorder_inclusion, process_type)
|
2023-04-04 20:00:13 +02:00
|
|
|
- .Initialize(memory_system_);
|
|
|
|
+ .Initialize(*memory_system_);
|
|
|
|
}
|
2022-09-29 18:37:59 +02:00
|
|
|
diff --git chrome/app/chrome_main_delegate.h chrome/app/chrome_main_delegate.h
|
2024-07-29 19:09:20 +02:00
|
|
|
index 521d5710b6387..8a5f3e6a312d2 100644
|
2022-09-29 18:37:59 +02:00
|
|
|
--- chrome/app/chrome_main_delegate.h
|
|
|
|
+++ chrome/app/chrome_main_delegate.h
|
2024-07-29 19:09:20 +02:00
|
|
|
@@ -17,6 +17,7 @@
|
2024-05-03 18:50:23 +02:00
|
|
|
#include "chrome/common/chrome_content_client.h"
|
|
|
|
#include "components/memory_system/memory_system.h"
|
|
|
|
#include "content/public/app/content_main_delegate.h"
|
|
|
|
+#include "ui/base/resource/resource_bundle.h"
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-05-03 18:50:23 +02:00
|
|
|
namespace base {
|
|
|
|
class CommandLine;
|
2024-07-29 19:09:20 +02:00
|
|
|
@@ -55,6 +56,8 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-09-29 18:37:59 +02:00
|
|
|
~ChromeMainDelegate() override;
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-09-29 18:37:59 +02:00
|
|
|
+ virtual void CleanupOnUIThread();
|
|
|
|
+
|
|
|
|
protected:
|
|
|
|
// content::ContentMainDelegate:
|
2024-01-26 03:12:43 +01:00
|
|
|
std::optional<int> BasicStartupComplete() override;
|
2024-07-29 19:09:20 +02:00
|
|
|
@@ -99,13 +102,17 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-05-03 18:50:23 +02:00
|
|
|
void InitializeMemorySystem();
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-05-03 18:50:23 +02:00
|
|
|
+ virtual ui::ResourceBundle::Delegate* GetResourceBundleDelegate() {
|
|
|
|
+ return nullptr;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
std::unique_ptr<ChromeContentBrowserClient> chrome_content_browser_client_;
|
|
|
|
std::unique_ptr<ChromeContentUtilityClient> chrome_content_utility_client_;
|
|
|
|
std::unique_ptr<tracing::TracingSamplerProfiler> tracing_sampler_profiler_;
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-04-04 20:00:13 +02:00
|
|
|
ChromeContentClient chrome_content_client_;
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-04-04 20:00:13 +02:00
|
|
|
- memory_system::MemorySystem memory_system_;
|
|
|
|
+ std::unique_ptr<memory_system::MemorySystem> memory_system_;
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-04-04 20:00:13 +02:00
|
|
|
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
|
|
std::unique_ptr<chromeos::LacrosService> lacros_service_;
|
2024-07-05 18:28:30 +02:00
|
|
|
diff --git chrome/app_shim/BUILD.gn chrome/app_shim/BUILD.gn
|
2024-09-27 16:15:44 +02:00
|
|
|
index db17714f74137..23f9f2eb3eb8b 100644
|
2024-07-05 18:28:30 +02:00
|
|
|
--- chrome/app_shim/BUILD.gn
|
|
|
|
+++ chrome/app_shim/BUILD.gn
|
|
|
|
@@ -24,6 +24,7 @@ source_set("app_shim") {
|
|
|
|
deps = [
|
|
|
|
"//base/allocator:early_zone_registration_apple",
|
|
|
|
"//build:chromeos_buildflags",
|
|
|
|
+ "//cef/libcef/features",
|
|
|
|
"//chrome:strings",
|
|
|
|
"//chrome/app:command_ids",
|
|
|
|
"//chrome/browser/renderer_host:history_swiper",
|
|
|
|
diff --git chrome/app_shim/chrome_main_app_mode_mac.mm chrome/app_shim/chrome_main_app_mode_mac.mm
|
|
|
|
index ac1361bd6bc2e..a303ca169c7f7 100644
|
|
|
|
--- chrome/app_shim/chrome_main_app_mode_mac.mm
|
|
|
|
+++ chrome/app_shim/chrome_main_app_mode_mac.mm
|
|
|
|
@@ -35,6 +35,7 @@
|
|
|
|
#include "base/task/single_thread_task_executor.h"
|
|
|
|
#include "base/task/thread_pool/thread_pool_instance.h"
|
|
|
|
#include "base/threading/thread.h"
|
|
|
|
+#include "cef/libcef/features/features.h"
|
|
|
|
#include "chrome/app/chrome_crash_reporter_client.h"
|
|
|
|
#include "chrome/app_shim/app_shim_controller.h"
|
|
|
|
#include "chrome/app_shim/app_shim_delegate.h"
|
|
|
|
@@ -171,7 +172,9 @@ int APP_SHIM_ENTRY_POINT_NAME(const app_mode::ChromeAppModeInfo* info) {
|
|
|
|
base::FilePath(info->user_data_dir).DirName().DirName().DirName();
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-07-05 18:28:30 +02:00
|
|
|
// TODO(crbug.com/40807881): Specify `user_data_dir` to CrashPad.
|
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
|
|
|
ChromeCrashReporterClient::Create();
|
|
|
|
+#endif
|
|
|
|
crash_reporter::InitializeCrashpad(true, "app_shim");
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-07-05 18:28:30 +02:00
|
|
|
base::PathService::OverrideAndCreateIfNeeded(
|
2020-06-25 04:34:12 +02:00
|
|
|
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
|
2024-10-24 17:05:31 +02:00
|
|
|
index a39ad24ec4f13..184c4532aa88f 100644
|
2020-06-25 04:34:12 +02:00
|
|
|
--- chrome/browser/chrome_browser_main.cc
|
|
|
|
+++ chrome/browser/chrome_browser_main.cc
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -52,6 +52,7 @@
|
2020-06-25 04:34:12 +02:00
|
|
|
#include "build/build_config.h"
|
2020-10-08 21:54:42 +02:00
|
|
|
#include "build/chromeos_buildflags.h"
|
2020-06-25 04:34:12 +02:00
|
|
|
#include "cc/base/switches.h"
|
2024-07-05 19:07:07 +02:00
|
|
|
+#include "cef/libcef/features/features.h"
|
2020-06-25 04:34:12 +02:00
|
|
|
#include "chrome/browser/about_flags.h"
|
|
|
|
#include "chrome/browser/active_use_util.h"
|
|
|
|
#include "chrome/browser/after_startup_task_utils.h"
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -527,7 +528,7 @@ void ProcessSingletonNotificationCallbackImpl(
|
2023-11-29 02:33:44 +01:00
|
|
|
return;
|
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-29 02:33:44 +01:00
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
|
|
+#if BUILDFLAG(IS_WIN) && !BUILDFLAG(ENABLE_CEF)
|
|
|
|
// The uninstall command-line switch is handled by the origin process; see
|
|
|
|
// ChromeMainDelegate::PostEarlyInitialization(...). The other process won't
|
|
|
|
// be able to become the singleton process and will display a window asking
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -842,7 +843,7 @@ int ChromeBrowserMainParts::PreEarlyInitialization() {
|
2023-11-21 20:17:55 +01:00
|
|
|
return content::RESULT_CODE_NORMAL_EXIT;
|
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
|
|
+#if BUILDFLAG(IS_WIN) && !BUILDFLAG(ENABLE_CEF)
|
|
|
|
// If we are running stale binaries then relaunch and exit immediately.
|
|
|
|
if (upgrade_util::IsRunningOldChrome()) {
|
|
|
|
if (!upgrade_util::RelaunchChromeBrowser(
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -855,7 +856,7 @@ int ChromeBrowserMainParts::PreEarlyInitialization() {
|
2023-11-21 20:17:55 +01:00
|
|
|
// result in browser startup bailing.
|
|
|
|
return chrome::RESULT_CODE_NORMAL_EXIT_UPGRADE_RELAUNCHED;
|
|
|
|
}
|
|
|
|
-#endif // BUILDFLAG(IS_WIN)
|
|
|
|
+#endif // BUILDFLAG(IS_WIN) && !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
return load_local_state_result;
|
|
|
|
}
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -965,7 +966,7 @@ int ChromeBrowserMainParts::OnLocalStateLoaded(
|
2023-11-21 20:17:55 +01:00
|
|
|
browser_process_->local_state());
|
|
|
|
platform_management_service->RefreshCache(base::NullCallback());
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
|
|
+#if BUILDFLAG(IS_WIN) && !BUILDFLAG(ENABLE_CEF)
|
|
|
|
if (first_run::IsChromeFirstRun()) {
|
|
|
|
bool stats_default;
|
|
|
|
if (GoogleUpdateSettings::GetCollectStatsConsentDefault(&stats_default)) {
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -978,7 +979,7 @@ int ChromeBrowserMainParts::OnLocalStateLoaded(
|
2023-11-21 20:17:55 +01:00
|
|
|
: metrics::EnableMetricsDefault::OPT_IN);
|
|
|
|
}
|
2023-01-23 18:58:40 +01:00
|
|
|
}
|
2023-11-21 20:17:55 +01:00
|
|
|
-#endif // BUILDFLAG(IS_WIN)
|
|
|
|
+#endif // BUILDFLAG(IS_WIN) && !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
std::string locale =
|
|
|
|
startup_data_->chrome_feature_list_creator()->actual_locale();
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1011,6 +1012,7 @@ int ChromeBrowserMainParts::ApplyFirstRunPrefs() {
|
2023-11-21 20:17:55 +01:00
|
|
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
|
master_prefs_ = std::make_unique<first_run::MasterPrefs>();
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
|
|
|
std::unique_ptr<installer::InitialPreferences> installer_initial_prefs =
|
|
|
|
startup_data_->chrome_feature_list_creator()->TakeInitialPrefs();
|
|
|
|
if (!installer_initial_prefs)
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1044,6 +1046,7 @@ int ChromeBrowserMainParts::ApplyFirstRunPrefs() {
|
2023-11-21 20:17:55 +01:00
|
|
|
master_prefs_->confirm_to_quit);
|
|
|
|
}
|
|
|
|
#endif // BUILDFLAG(IS_MAC)
|
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2023-01-23 18:58:40 +01:00
|
|
|
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
2023-11-21 20:17:55 +01:00
|
|
|
return content::RESULT_CODE_NORMAL_EXIT;
|
|
|
|
}
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1105,6 +1108,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
browser_process_->browser_policy_connector()->OnResourceBundleCreated();
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
|
|
|
// Android does first run in Java instead of native.
|
|
|
|
// Chrome OS has its own out-of-box-experience code.
|
|
|
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1126,6 +1130,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
2023-11-21 20:17:55 +01:00
|
|
|
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
2023-01-23 18:58:40 +01:00
|
|
|
}
|
2023-11-21 20:17:55 +01:00
|
|
|
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-02-22 19:36:15 +01:00
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
|
|
#if defined(ARCH_CPU_X86_64)
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1497,6 +1502,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
2023-11-21 20:17:55 +01:00
|
|
|
browser_process_->PreMainMessageLoopRun();
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-01-23 18:58:40 +01:00
|
|
|
#if BUILDFLAG(IS_WIN)
|
2023-11-21 20:17:55 +01:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
|
|
|
// If the command line specifies 'uninstall' then we need to work here
|
|
|
|
// unless we detect another chrome browser running.
|
|
|
|
if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUninstall)) {
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1508,6 +1514,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
2023-11-21 20:17:55 +01:00
|
|
|
return ChromeBrowserMainPartsWin::HandleIconsCommands(
|
|
|
|
*base::CommandLine::ForCurrentProcess());
|
|
|
|
}
|
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
ui::SelectFileDialog::SetFactory(
|
|
|
|
std::make_unique<ChromeSelectFileDialogFactory>());
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1530,6 +1537,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
2023-11-21 20:17:55 +01:00
|
|
|
}
|
2024-02-22 19:36:15 +01:00
|
|
|
#endif // BUILDFLAG(CHROME_FOR_TESTING)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
|
|
|
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
|
|
|
switches::kMakeDefaultBrowser)) {
|
|
|
|
bool is_managed = g_browser_process->local_state()->IsManagedPreference(
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1543,18 +1551,22 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
2023-11-21 20:17:55 +01:00
|
|
|
? static_cast<int>(content::RESULT_CODE_NORMAL_EXIT)
|
|
|
|
: static_cast<int>(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED);
|
|
|
|
}
|
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
#if defined(USE_AURA)
|
|
|
|
// Make sure aura::Env has been initialized.
|
|
|
|
CHECK(aura::Env::GetInstance());
|
|
|
|
#endif // defined(USE_AURA)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
+
|
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
|
|
// We must call DoUpgradeTasks now that we own the browser singleton to
|
|
|
|
// finish upgrade tasks (swap) and relaunch if necessary.
|
|
|
|
if (upgrade_util::DoUpgradeTasks(*base::CommandLine::ForCurrentProcess()))
|
|
|
|
return chrome::RESULT_CODE_NORMAL_EXIT_UPGRADE_RELAUNCHED;
|
|
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
#if !BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_DOWNGRADE_PROCESSING)
|
|
|
|
// Begin relaunch processing immediately if User Data migration is required
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1593,7 +1605,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
2023-11-21 20:17:55 +01:00
|
|
|
}
|
2024-02-22 19:36:15 +01:00
|
|
|
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
|
|
+#if BUILDFLAG(IS_WIN) && !BUILDFLAG(ENABLE_CEF)
|
2023-01-23 18:58:40 +01:00
|
|
|
// Check if there is any machine level Chrome installed on the current
|
2023-11-21 20:17:55 +01:00
|
|
|
// machine. If yes and the current Chrome process is user level, we do not
|
|
|
|
// allow the user level Chrome to run. So we notify the user and uninstall
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1602,7 +1614,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
2023-11-21 20:17:55 +01:00
|
|
|
// obtained but before potentially creating the first run sentinel).
|
|
|
|
if (ChromeBrowserMainPartsWin::CheckMachineLevelInstall())
|
|
|
|
return chrome::RESULT_CODE_MACHINE_LEVEL_INSTALL_EXISTS;
|
|
|
|
-#endif // BUILDFLAG(IS_WIN)
|
|
|
|
+#endif // BUILDFLAG(IS_WIN) && !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
// Desktop construction occurs here, (required before profile creation).
|
|
|
|
PreProfileInit();
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1675,6 +1687,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
2023-11-21 20:17:55 +01:00
|
|
|
// Call `PostProfileInit()`and set it up for profiles created later.
|
|
|
|
profile_init_manager_ = std::make_unique<ProfileInitManager>(this, profile);
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
|
|
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
|
// Execute first run specific code after the PrefService has been initialized
|
|
|
|
// and preferences have been registered since some of the import code depends
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1714,6 +1727,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
2023-11-21 20:17:55 +01:00
|
|
|
*base::CommandLine::ForCurrentProcess());
|
|
|
|
}
|
|
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2023-11-21 20:17:55 +01:00
|
|
|
// Configure modules that need access to resources.
|
|
|
|
net::NetModule::SetResourceProvider(ChromeNetResourceProvider);
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1805,6 +1819,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
2023-12-06 21:16:15 +01:00
|
|
|
g_browser_process->profile_manager()->GetLastOpenedProfiles();
|
2023-01-23 18:58:40 +01:00
|
|
|
}
|
|
|
|
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
2023-12-06 21:16:15 +01:00
|
|
|
+
|
2023-01-23 18:58:40 +01:00
|
|
|
+ // Bypass StartupBrowserCreator and RunLoop creation with CEF.
|
|
|
|
+ // CEF with the Chrome runtime will create and manage its own RunLoop.
|
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
|
|
|
+
|
2023-12-06 21:16:15 +01:00
|
|
|
// This step is costly.
|
2023-11-21 20:17:55 +01:00
|
|
|
if (browser_creator_->Start(*base::CommandLine::ForCurrentProcess(),
|
2023-12-06 21:16:15 +01:00
|
|
|
base::FilePath(), profile_info,
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1837,11 +1856,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2021-12-16 23:35:54 +01:00
|
|
|
// Create the RunLoop for MainMessageLoopRun() to use and transfer
|
|
|
|
// ownership of the browser's lifetime to the BrowserProcess.
|
|
|
|
+ // CEF with the Chrome runtime will create and manage its own RunLoop.
|
|
|
|
DCHECK(!GetMainRunLoopInstance());
|
2023-01-23 18:58:40 +01:00
|
|
|
GetMainRunLoopInstance() = std::make_unique<base::RunLoop>();
|
2021-12-16 23:35:54 +01:00
|
|
|
browser_process_->SetQuitClosure(
|
|
|
|
GetMainRunLoopInstance()->QuitWhenIdleClosure());
|
|
|
|
}
|
2023-01-23 18:58:40 +01:00
|
|
|
+#endif // !BUILDFLAG(ENABLE_CEF)
|
|
|
|
+
|
|
|
|
browser_creator_.reset();
|
|
|
|
#endif // !BUILDFLAG(IS_ANDROID)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2021-02-23 21:08:33 +01:00
|
|
|
diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
|
2024-08-26 14:44:25 +02:00
|
|
|
index e26e3625c99c8..c0d4a95607e37 100644
|
2021-02-23 21:08:33 +01:00
|
|
|
--- chrome/browser/chrome_browser_main_mac.mm
|
|
|
|
+++ chrome/browser/chrome_browser_main_mac.mm
|
2024-06-14 19:01:45 +02:00
|
|
|
@@ -20,6 +20,7 @@
|
2021-02-23 21:08:33 +01:00
|
|
|
#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"
|
2024-08-26 14:44:25 +02:00
|
|
|
@@ -125,6 +126,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
|
2021-02-23 21:08:33 +01:00
|
|
|
}
|
2023-01-30 18:43:54 +01:00
|
|
|
#endif // !BUILDFLAG(CHROME_FOR_TESTING)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2021-02-23 21:08:33 +01:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
2023-06-26 12:13:38 +02:00
|
|
|
// Create the app delegate by requesting the shared AppController.
|
|
|
|
CHECK_EQ(nil, NSApp.delegate);
|
|
|
|
AppController* app_controller = AppController.sharedController;
|
2024-08-26 14:44:25 +02:00
|
|
|
@@ -133,6 +135,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
|
2021-02-23 21:08:33 +01:00
|
|
|
chrome::BuildMainMenu(NSApp, app_controller,
|
|
|
|
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false);
|
|
|
|
[app_controller mainMenuCreated];
|
|
|
|
+#endif // BUILDFLAG(ENABLE_CEF)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-05-19 12:28:44 +02:00
|
|
|
ui::WarmScreenCapture();
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-08-26 14:44:25 +02:00
|
|
|
@@ -187,5 +190,7 @@ void ChromeBrowserMainPartsMac::PostMainMessageLoopRun() {
|
2021-02-23 21:08:33 +01:00
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2021-02-23 21:08:33 +01:00
|
|
|
void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
|
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
2023-06-26 12:13:38 +02:00
|
|
|
[AppController.sharedController didEndMainMessageLoop];
|
2021-02-23 21:08:33 +01:00
|
|
|
+#endif
|
|
|
|
}
|
2021-03-04 23:36:57 +01:00
|
|
|
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
2024-10-24 17:05:31 +02:00
|
|
|
index 3ca6369dd6981..351d5e20dade6 100644
|
2021-03-04 23:36:57 +01:00
|
|
|
--- chrome/browser/chrome_content_browser_client.cc
|
|
|
|
+++ chrome/browser/chrome_content_browser_client.cc
|
2024-08-26 14:44:25 +02:00
|
|
|
@@ -48,6 +48,7 @@
|
2021-03-04 23:36:57 +01:00
|
|
|
#include "build/build_config.h"
|
|
|
|
#include "build/chromeos_buildflags.h"
|
2023-12-06 21:16:15 +01:00
|
|
|
#include "build/config/chromebox_for_meetings/buildflags.h" // PLATFORM_CFM
|
2021-03-04 23:36:57 +01:00
|
|
|
+#include "cef/libcef/features/features.h"
|
2021-06-04 03:34:56 +02:00
|
|
|
#include "chrome/browser/after_startup_task_utils.h"
|
2024-07-29 19:09:20 +02:00
|
|
|
#include "chrome/browser/ai/ai_manager_keyed_service_factory.h"
|
2024-02-22 19:36:15 +01:00
|
|
|
#include "chrome/browser/app_mode/app_mode_utils.h"
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1514,6 +1515,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
|
2023-04-04 20:00:13 +02:00
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-03-09 20:45:39 +01:00
|
|
|
ChromeContentBrowserClient::ChromeContentBrowserClient() {
|
|
|
|
+ keepalive_timer_.reset(new base::OneShotTimer());
|
|
|
|
+
|
|
|
|
#if BUILDFLAG(ENABLE_PLUGINS)
|
2023-04-26 21:55:59 +02:00
|
|
|
extra_parts_.push_back(
|
|
|
|
std::make_unique<ChromeContentBrowserClientPluginsPart>());
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1551,6 +1554,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
|
2023-04-26 21:55:59 +02:00
|
|
|
}
|
2022-03-09 20:45:39 +01:00
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-03-09 20:45:39 +01:00
|
|
|
+void ChromeContentBrowserClient::CleanupOnUIThread() {
|
|
|
|
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
+ keepalive_timer_.reset();
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
// static
|
|
|
|
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
|
|
|
|
PrefRegistrySimple* registry) {
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -3969,28 +3977,25 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs,
|
2024-04-23 22:06:00 +02:00
|
|
|
web_prefs->preferred_color_scheme;
|
2024-03-29 17:48:33 +01:00
|
|
|
}
|
|
|
|
#else
|
2024-05-23 03:52:35 +02:00
|
|
|
- // Update based on native theme scheme.
|
|
|
|
- web_prefs->preferred_color_scheme =
|
|
|
|
- ToBlinkPreferredColorScheme(native_theme->GetPreferredColorScheme());
|
|
|
|
-
|
|
|
|
- bool using_different_colored_frame = false;
|
|
|
|
- if (Profile* profile =
|
|
|
|
- Profile::FromBrowserContext(web_contents->GetBrowserContext())) {
|
|
|
|
- if (ThemeService* theme_service =
|
|
|
|
- ThemeServiceFactory::GetForProfile(profile)) {
|
|
|
|
- using_different_colored_frame = !theme_service->UsingDefaultTheme() ||
|
|
|
|
- theme_service->GetUserColor().has_value();
|
|
|
|
- }
|
2024-03-29 17:48:33 +01:00
|
|
|
+ auto preferred_color_scheme = native_theme->GetPreferredColorScheme();
|
|
|
|
+
|
|
|
|
+ auto* profile = Profile::FromBrowserContext(
|
|
|
|
+ web_contents->GetBrowserContext());
|
|
|
|
+ const auto* theme_service = ThemeServiceFactory::GetForProfile(profile);
|
|
|
|
+
|
|
|
|
+ const auto browser_color_scheme = theme_service->GetBrowserColorScheme();
|
|
|
|
+ if (browser_color_scheme != ThemeService::BrowserColorScheme::kSystem) {
|
|
|
|
+ // Override the native theme.
|
|
|
|
+ preferred_color_scheme =
|
|
|
|
+ browser_color_scheme == ThemeService::BrowserColorScheme::kLight
|
|
|
|
+ ? ui::NativeTheme::PreferredColorScheme::kLight
|
|
|
|
+ : ui::NativeTheme::PreferredColorScheme::kDark;
|
2024-05-23 03:52:35 +02:00
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-05-23 03:52:35 +02:00
|
|
|
- // Update based on the ColorProvider associated with `web_contents`. Depends
|
|
|
|
- // on the browser color mode settings and whether the user profile has set a
|
|
|
|
- // custom coloring for the browser ui.
|
|
|
|
- web_prefs->preferred_root_scrollbar_color_scheme =
|
|
|
|
- web_contents->GetColorMode() == ui::ColorProviderKey::ColorMode::kLight ||
|
|
|
|
- using_different_colored_frame
|
|
|
|
- ? blink::mojom::PreferredColorScheme::kLight
|
|
|
|
- : blink::mojom::PreferredColorScheme::kDark;
|
|
|
|
+ // Update based on native theme scheme.
|
|
|
|
+ web_prefs->preferred_color_scheme =
|
|
|
|
+ web_prefs->preferred_root_scrollbar_color_scheme =
|
2024-03-29 17:48:33 +01:00
|
|
|
+ ToBlinkPreferredColorScheme(preferred_color_scheme);
|
2024-05-23 03:52:35 +02:00
|
|
|
#endif // BUILDFLAG(IS_ANDROID)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-05-23 03:52:35 +02:00
|
|
|
// Reauth WebUI doesn't support dark mode yet because it shares the dialog
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -4744,9 +4749,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
|
2021-03-04 23:36:57 +01:00
|
|
|
&search::HandleNewTabURLReverseRewrite);
|
2022-01-25 21:26:51 +01:00
|
|
|
#endif // BUILDFLAG(IS_ANDROID)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2021-03-04 23:36:57 +01:00
|
|
|
+#if !BUILDFLAG(ENABLE_CEF)
|
|
|
|
// chrome: & friends.
|
|
|
|
handler->AddHandlerPair(&ChromeContentBrowserClient::HandleWebUI,
|
|
|
|
&ChromeContentBrowserClient::HandleWebUIReverse);
|
|
|
|
+#endif
|
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2021-03-04 23:36:57 +01:00
|
|
|
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -6883,7 +6890,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
|
2023-04-04 20:00:13 +02:00
|
|
|
#endif
|
2021-10-19 00:17:16 +02:00
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2021-10-19 00:17:16 +02:00
|
|
|
-void ChromeContentBrowserClient::ConfigureNetworkContextParams(
|
|
|
|
+bool ChromeContentBrowserClient::ConfigureNetworkContextParams(
|
|
|
|
content::BrowserContext* context,
|
|
|
|
bool in_memory,
|
|
|
|
const base::FilePath& relative_partition_path,
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -6901,6 +6908,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
|
2021-12-16 23:35:54 +01:00
|
|
|
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
|
2021-10-19 00:17:16 +02:00
|
|
|
network_context_params->accept_language = GetApplicationLocale();
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ return true;
|
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2021-10-19 00:17:16 +02:00
|
|
|
std::vector<base::FilePath>
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -8063,11 +8072,11 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
|
2022-03-09 20:45:39 +01:00
|
|
|
const auto now = base::TimeTicks::Now();
|
|
|
|
const auto timeout = GetKeepaliveTimerTimeout(context);
|
|
|
|
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
|
|
|
|
- if (keepalive_deadline_ > now && !keepalive_timer_.IsRunning()) {
|
|
|
|
+ if (keepalive_deadline_ > now && !keepalive_timer_->IsRunning()) {
|
2024-08-26 14:44:25 +02:00
|
|
|
if (!KeepAliveRegistry::GetInstance()->IsShuttingDown()) {
|
|
|
|
DVLOG(1) << "Starting a keepalive timer(" << timeout.InSecondsF()
|
|
|
|
<< " seconds)";
|
|
|
|
- keepalive_timer_.Start(
|
|
|
|
+ keepalive_timer_->Start(
|
|
|
|
FROM_HERE, keepalive_deadline_ - now,
|
|
|
|
base::BindOnce(
|
|
|
|
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -8089,7 +8098,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
|
2022-03-09 20:45:39 +01:00
|
|
|
--num_keepalive_requests_;
|
|
|
|
if (num_keepalive_requests_ == 0) {
|
|
|
|
DVLOG(1) << "Stopping the keepalive timer";
|
|
|
|
- keepalive_timer_.Stop();
|
|
|
|
+ if (keepalive_timer_)
|
|
|
|
+ keepalive_timer_->Stop();
|
|
|
|
// This deletes the keep alive handle attached to the timer function and
|
|
|
|
// unblock the shutdown sequence.
|
|
|
|
}
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -8263,7 +8273,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
|
2022-03-09 20:45:39 +01:00
|
|
|
const auto now = base::TimeTicks::Now();
|
|
|
|
const auto then = keepalive_deadline_;
|
|
|
|
if (now < then) {
|
|
|
|
- keepalive_timer_.Start(
|
|
|
|
+ keepalive_timer_->Start(
|
|
|
|
FROM_HERE, then - now,
|
|
|
|
base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired,
|
|
|
|
weak_factory_.GetWeakPtr(),
|
2021-10-19 00:17:16 +02:00
|
|
|
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
|
2024-10-24 17:05:31 +02:00
|
|
|
index b33a4b957d997..57942809579bf 100644
|
2021-10-19 00:17:16 +02:00
|
|
|
--- chrome/browser/chrome_content_browser_client.h
|
|
|
|
+++ chrome/browser/chrome_content_browser_client.h
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -149,6 +149,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-03-09 20:45:39 +01:00
|
|
|
~ChromeContentBrowserClient() override;
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-03-09 20:45:39 +01:00
|
|
|
+ virtual void CleanupOnUIThread();
|
|
|
|
+
|
2024-05-23 03:52:35 +02:00
|
|
|
// TODO(crbug.com/41356866): This file is about calls from content/ out
|
2022-03-09 20:45:39 +01:00
|
|
|
// to chrome/ to get values or notify about events, but both of these
|
|
|
|
// functions are from chrome/ to chrome/ and don't involve content/ at all.
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -713,7 +715,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
2021-10-19 00:17:16 +02:00
|
|
|
override;
|
|
|
|
void OnNetworkServiceCreated(
|
|
|
|
network::mojom::NetworkService* network_service) override;
|
|
|
|
- void ConfigureNetworkContextParams(
|
|
|
|
+ bool ConfigureNetworkContextParams(
|
|
|
|
content::BrowserContext* context,
|
|
|
|
bool in_memory,
|
|
|
|
const base::FilePath& relative_partition_path,
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1272,7 +1274,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-03-09 20:45:39 +01:00
|
|
|
#if !BUILDFLAG(IS_ANDROID)
|
|
|
|
uint64_t num_keepalive_requests_ = 0;
|
|
|
|
- base::OneShotTimer keepalive_timer_;
|
|
|
|
+ std::unique_ptr<base::OneShotTimer> keepalive_timer_;
|
|
|
|
base::TimeTicks keepalive_deadline_;
|
|
|
|
#endif
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2021-04-10 04:00:33 +02:00
|
|
|
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
|
2024-10-24 17:05:31 +02:00
|
|
|
index f74be30365805..74be892e89645 100644
|
2021-04-10 04:00:33 +02:00
|
|
|
--- chrome/browser/prefs/browser_prefs.cc
|
|
|
|
+++ chrome/browser/prefs/browser_prefs.cc
|
2024-02-22 19:36:15 +01:00
|
|
|
@@ -16,6 +16,7 @@
|
2021-04-10 04:00:33 +02:00
|
|
|
#include "build/build_config.h"
|
2021-10-19 00:17:16 +02:00
|
|
|
#include "build/chromecast_buildflags.h"
|
2021-04-10 04:00:33 +02:00
|
|
|
#include "build/chromeos_buildflags.h"
|
|
|
|
+#include "cef/libcef/features/features.h"
|
|
|
|
#include "chrome/browser/about_flags.h"
|
|
|
|
#include "chrome/browser/accessibility/accessibility_labels_service.h"
|
2024-02-22 19:36:15 +01:00
|
|
|
#include "chrome/browser/accessibility/invert_bubble_prefs.h"
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -212,6 +213,10 @@
|
2024-09-27 16:15:44 +02:00
|
|
|
#include "extensions/browser/pref_names.h"
|
|
|
|
#endif // BUILDFLAG(ENABLE_EXTENSIONS_CORE)
|
|
|
|
|
2021-04-10 04:00:33 +02:00
|
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
|
|
+#include "cef/libcef/browser/prefs/browser_prefs.h"
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
|
|
#include "chrome/browser/accessibility/animation_policy_prefs.h"
|
|
|
|
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1863,7 +1868,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
2024-02-22 19:36:15 +01:00
|
|
|
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
|
|
#endif // BUILDFLAG(IS_WIN)
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-02-22 19:36:15 +01:00
|
|
|
-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
|
|
|
|
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && \
|
|
|
|
+ BUILDFLAG(ENABLE_DOWNGRADE_PROCESSING)
|
2023-11-21 20:17:55 +01:00
|
|
|
downgrade::RegisterPrefs(registry);
|
|
|
|
#endif
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -1916,6 +1922,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-10-26 00:50:29 +02:00
|
|
|
// This is intentionally last.
|
|
|
|
RegisterLocalStatePrefsForMigration(registry);
|
|
|
|
+
|
|
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
|
|
+ // Always call this last.
|
|
|
|
+ browser_prefs::RegisterLocalStatePrefs(registry);
|
|
|
|
+#endif
|
|
|
|
}
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2022-10-26 00:50:29 +02:00
|
|
|
// Register prefs applicable to all profiles.
|
2024-10-24 17:05:31 +02:00
|
|
|
@@ -2368,6 +2379,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
2022-10-26 00:50:29 +02:00
|
|
|
const std::string& locale) {
|
|
|
|
RegisterProfilePrefs(registry, locale);
|
2024-09-27 16:15:44 +02:00
|
|
|
|
2021-04-10 04:00:33 +02:00
|
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
|
|
+ browser_prefs::RegisterProfilePrefs(registry);
|
|
|
|
+#endif
|
|
|
|
+
|
2022-10-26 00:50:29 +02:00
|
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
|
|
::android::RegisterUserProfilePrefs(registry);
|
|
|
|
#endif
|