Update to Chromium version 96.0.4664.18

This commit is contained in:
Marshall Greenblatt
2021-10-21 19:53:33 -04:00
parent 6872dadd74
commit 30e2decbac
15 changed files with 51 additions and 50 deletions

View File

@@ -211,7 +211,7 @@ index 0c8939e57e814..25c0a2acff7dd 100644
bool in_memory,
const base::FilePath& relative_partition_path,
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index d5ed8faa24cfb..a30a0eed11278 100644
index 77e924414c443..4bc52e14a9722 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@
@@ -222,7 +222,7 @@ index d5ed8faa24cfb..a30a0eed11278 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_ui.h"
@@ -167,6 +168,10 @@
@@ -168,6 +169,10 @@
#include "chrome/browser/background/background_mode_manager.h"
#endif
@@ -233,7 +233,7 @@ index d5ed8faa24cfb..a30a0eed11278 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1195,6 +1200,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1197,6 +1202,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
SessionDataService::RegisterProfilePrefs(registry);
#endif