Update to Chromium version 93.0.4577.15

This commit is contained in:
Marshall Greenblatt
2021-07-28 21:29:46 -04:00
parent 0cfa65b48c
commit 2d46bb789e
61 changed files with 277 additions and 276 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
index 173582c7c4904..bbf57904b6de9 100644
index 173582c7c490..bbf57904b6de 100644
--- chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -8,6 +8,7 @@
@@ -54,7 +54,7 @@ index 173582c7c4904..bbf57904b6de9 100644
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
SupervisedUserSettingsService* supervised_service =
diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc
index 610f6d942998c..f822df04ff07d 100644
index 610f6d942998..f822df04ff07 100644
--- components/content_settings/renderer/content_settings_agent_impl.cc
+++ components/content_settings/renderer/content_settings_agent_impl.cc
@@ -170,7 +170,7 @@ ContentSetting GetContentSettingFromRulesImpl(