Update to Chromium version 97.0.4692.56
This commit is contained in:
parent
b2e06a3503
commit
6f35d008bf
|
@ -7,6 +7,6 @@
|
|||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/97.0.4692.45',
|
||||
'chromium_checkout': 'refs/tags/97.0.4692.56',
|
||||
'depot_tools_checkout': 'f7b8f8f3cd'
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||
index 1dbd99cace756..922efee40f1de 100644
|
||||
index 80cb9bb1aff58..5459e4e490cbe 100644
|
||||
--- chrome/browser/BUILD.gn
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -13,6 +13,7 @@ import("//build/config/features.gni")
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||
index 711454d213148..5a8a0d53c16f1 100644
|
||||
index faf0adece6538..ecc889900d414 100644
|
||||
--- chrome/browser/ui/BUILD.gn
|
||||
+++ chrome/browser/ui/BUILD.gn
|
||||
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
|
||||
|
|
|
@ -156,7 +156,7 @@ index 95d1ebc190910..13cdfa52db108 100644
|
|||
+#endif
|
||||
}
|
||||
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
||||
index c640ba0cc074e..0f099b6a88b40 100644
|
||||
index 9db18f904096c..a71835d11ce80 100644
|
||||
--- chrome/browser/chrome_content_browser_client.cc
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -28,6 +28,7 @@
|
||||
|
@ -211,7 +211,7 @@ index 99ab233c779f3..0813b9156c3b5 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 a55c24300b40b..47369c7079e6f 100644
|
||||
index 5e4f2cf8ad0a9..72e50dd0919e3 100644
|
||||
--- chrome/browser/prefs/browser_prefs.cc
|
||||
+++ chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -11,6 +11,7 @@
|
||||
|
|
|
@ -12,7 +12,7 @@ index e2e2dcebcdcdb..35443d0e2af1a 100644
|
|||
# https://crbug.com/474506.
|
||||
"//clank/java/BUILD.gn",
|
||||
diff --git BUILD.gn BUILD.gn
|
||||
index 8b6f4bf90557a..6071a3a625a8c 100644
|
||||
index ded212346ab15..74a598a6c5c25 100644
|
||||
--- BUILD.gn
|
||||
+++ BUILD.gn
|
||||
@@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
index 2b1be225cb402..c2b422f47a970 100644
|
||||
index b3f2ad70b93b6..9707298db5527 100644
|
||||
--- content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
@@ -668,10 +668,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
|
||||
|
@ -19,7 +19,7 @@ index 2b1be225cb402..c2b422f47a970 100644
|
|||
}
|
||||
|
||||
absl::optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
|
||||
@@ -2149,6 +2151,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
|
||||
@@ -2141,6 +2143,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
|
||||
// This needs to happen only after |window_| has been initialized using
|
||||
// Init(), because it needs to have the layer.
|
||||
window_->SetEmbedFrameSinkId(frame_sink_id_);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
|
||||
index 84efb47a4e53f..e00f8fddbb742 100644
|
||||
index ed132cbc138e8..0a0b7eed25bb9 100644
|
||||
--- chrome/browser/net/profile_network_context_service.cc
|
||||
+++ chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -21,6 +21,7 @@
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
||||
index 39af46eb880ae..dc0f17dc646eb 100644
|
||||
index 8787f93c66757..b0ada1329c9d1 100644
|
||||
--- chrome/app/generated_resources.grd
|
||||
+++ chrome/app/generated_resources.grd
|
||||
@@ -5396,7 +5396,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||
@@ -5380,7 +5380,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||
</message>
|
||||
</if>
|
||||
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">
|
||||
|
|
Loading…
Reference in New Issue