mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 116.0.5845.0 (#1160321)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
|
||||
index 67dc4a2e0695e..16f819e133886 100644
|
||||
index b8cfd5d2daa3b..51b52a3f34409 100644
|
||||
--- chrome/browser/themes/theme_service.cc
|
||||
+++ chrome/browser/themes/theme_service.cc
|
||||
@@ -30,6 +30,7 @@
|
||||
@@ -10,8 +10,8 @@ index 67dc4a2e0695e..16f819e133886 100644
|
||||
#include "chrome/browser/browser_features.h"
|
||||
#include "chrome/browser/extensions/extension_service.h"
|
||||
#include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
|
||||
@@ -68,6 +69,10 @@
|
||||
#include "ui/color/color_provider.h"
|
||||
@@ -70,6 +71,10 @@
|
||||
#include "ui/color/color_provider_manager.h"
|
||||
#include "ui/native_theme/native_theme.h"
|
||||
|
||||
+#if BUILDFLAG(ENABLE_CEF)
|
||||
@@ -21,7 +21,7 @@ index 67dc4a2e0695e..16f819e133886 100644
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#include "base/scoped_observation.h"
|
||||
#include "extensions/browser/extension_registry_observer.h"
|
||||
@@ -270,11 +275,19 @@ void ThemeService::Init() {
|
||||
@@ -272,11 +277,19 @@ void ThemeService::Init() {
|
||||
// OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
|
||||
// constructed in time to observe the corresponding events.
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
@@ -42,18 +42,18 @@ index 67dc4a2e0695e..16f819e133886 100644
|
||||
theme_syncable_service_ =
|
||||
std::make_unique<ThemeSyncableService>(profile_, this);
|
||||
diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc
|
||||
index c8382bbee253b..a48c7b52252db 100644
|
||||
index ebf3978910959..af00465d254a1 100644
|
||||
--- chrome/browser/themes/theme_service_factory.cc
|
||||
+++ chrome/browser/themes/theme_service_factory.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "base/no_destructor.h"
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "base/trace_event/trace_event.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
+#include "cef/libcef/features/runtime.h"
|
||||
#include "chrome/browser/extensions/extension_system_factory.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/themes/theme_service.h"
|
||||
@@ -31,6 +32,10 @@
|
||||
@@ -34,6 +35,10 @@
|
||||
#include "ui/linux/linux_ui_factory.h"
|
||||
#endif
|
||||
|
||||
@@ -64,7 +64,7 @@ index c8382bbee253b..a48c7b52252db 100644
|
||||
namespace {
|
||||
|
||||
const ThemeHelper& GetThemeHelper() {
|
||||
@@ -79,7 +84,15 @@ ThemeServiceFactory::ThemeServiceFactory()
|
||||
@@ -95,7 +100,15 @@ ThemeServiceFactory::ThemeServiceFactory()
|
||||
.Build()) {
|
||||
DependsOn(extensions::ExtensionRegistryFactory::GetInstance());
|
||||
DependsOn(extensions::ExtensionPrefsFactory::GetInstance());
|
||||
|
Reference in New Issue
Block a user