Update to Chromium version 94.0.4606.0 (#911515)

This commit is contained in:
Marshall Greenblatt
2021-08-19 19:40:49 -04:00
parent 955097ea77
commit 25c1947f1d
85 changed files with 745 additions and 726 deletions

View File

@ -1,8 +1,8 @@
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
index ca830ceefd5d5..8b3af9620670d 100644
index abba09a2eda93..d9e23612dfa0e 100644
--- chrome/browser/themes/theme_service.cc
+++ chrome/browser/themes/theme_service.cc
@@ -27,6 +27,7 @@
@@ -26,6 +26,7 @@
#include "base/task/thread_pool.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
@ -10,7 +10,7 @@ index ca830ceefd5d5..8b3af9620670d 100644
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
#include "chrome/browser/profiles/profile.h"
@@ -59,6 +60,10 @@
@@ -58,6 +59,10 @@
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/base/layout.h"
@ -21,7 +21,7 @@ index ca830ceefd5d5..8b3af9620670d 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "base/scoped_observation.h"
#include "extensions/browser/extension_registry_observer.h"
@@ -281,11 +286,19 @@ void ThemeService::Init() {
@@ -280,11 +285,19 @@ void ThemeService::Init() {
// OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
// constructed in time to observe the corresponding events.
#if BUILDFLAG(ENABLE_EXTENSIONS)