mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 102.0.4997.0 (#990845)
- Windows: SDK version 10.0.20348.0 is now required. - MacOS: SDK version 12.3 (Xcode 13.3) is now required. - Legacy swiftshader binaries (`swiftshader/*` on Win/Linux and `libswiftshader_*.dylib` on MacOS) have been removed (see issue #3176).
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
|
||||
index e921b7e8be8dc..414358c5191f1 100644
|
||||
index a61c192f90de2..79b1fa46b2421 100644
|
||||
--- chrome/browser/themes/theme_service.cc
|
||||
+++ chrome/browser/themes/theme_service.cc
|
||||
@@ -32,6 +32,7 @@
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "base/threading/thread_task_runner_handle.h"
|
||||
#include "base/trace_event/trace_event.h"
|
||||
#include "build/build_config.h"
|
||||
@@ -10,7 +10,7 @@ index e921b7e8be8dc..414358c5191f1 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 @@
|
||||
@@ -67,6 +68,10 @@
|
||||
#include "ui/color/color_id.h"
|
||||
#include "ui/color/color_provider.h"
|
||||
|
||||
@@ -21,7 +21,7 @@ index e921b7e8be8dc..414358c5191f1 100644
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#include "base/scoped_observation.h"
|
||||
#include "extensions/browser/extension_registry_observer.h"
|
||||
@@ -573,11 +578,19 @@ void ThemeService::Init() {
|
||||
@@ -570,11 +575,19 @@ void ThemeService::Init() {
|
||||
// OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
|
||||
// constructed in time to observe the corresponding events.
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
|
Reference in New Issue
Block a user