mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 115.0.5790.0 (#1148114)
- Mac: 13.3 SDK (Xcode 14.3) is now required
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
|
||||
index a23a2830b374c..c6822853a6c3d 100644
|
||||
index 67dc4a2e0695e..16f819e133886 100644
|
||||
--- chrome/browser/themes/theme_service.cc
|
||||
+++ chrome/browser/themes/theme_service.cc
|
||||
@@ -30,6 +30,7 @@
|
||||
@ -10,7 +10,7 @@ index a23a2830b374c..c6822853a6c3d 100644
|
||||
#include "chrome/browser/browser_features.h"
|
||||
#include "chrome/browser/extensions/extension_service.h"
|
||||
#include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
|
||||
@@ -66,6 +67,10 @@
|
||||
@@ -68,6 +69,10 @@
|
||||
#include "ui/color/color_provider.h"
|
||||
#include "ui/native_theme/native_theme.h"
|
||||
|
||||
@ -21,7 +21,7 @@ index a23a2830b374c..c6822853a6c3d 100644
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#include "base/scoped_observation.h"
|
||||
#include "extensions/browser/extension_registry_observer.h"
|
||||
@@ -268,11 +273,19 @@ void ThemeService::Init() {
|
||||
@@ -270,11 +275,19 @@ void ThemeService::Init() {
|
||||
// OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
|
||||
// constructed in time to observe the corresponding events.
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
@ -42,7 +42,7 @@ index a23a2830b374c..c6822853a6c3d 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 622dcc82663c5..7fbe022c1f78b 100644
|
||||
index c8382bbee253b..a48c7b52252db 100644
|
||||
--- chrome/browser/themes/theme_service_factory.cc
|
||||
+++ chrome/browser/themes/theme_service_factory.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
@ -64,8 +64,8 @@ index 622dcc82663c5..7fbe022c1f78b 100644
|
||||
namespace {
|
||||
|
||||
const ThemeHelper& GetThemeHelper() {
|
||||
@@ -74,7 +79,15 @@ ThemeServiceFactory::ThemeServiceFactory()
|
||||
ProfileSelections::BuildRedirectedInIncognito()) {
|
||||
@@ -79,7 +84,15 @@ ThemeServiceFactory::ThemeServiceFactory()
|
||||
.Build()) {
|
||||
DependsOn(extensions::ExtensionRegistryFactory::GetInstance());
|
||||
DependsOn(extensions::ExtensionPrefsFactory::GetInstance());
|
||||
+#if BUILDFLAG(ENABLE_CEF)
|
||||
|
Reference in New Issue
Block a user