Update to Chromium version 107.0.5304.18

This commit is contained in:
Marshall Greenblatt
2022-09-29 15:08:18 -04:00
parent 4e43f90244
commit 318ab1716e
7 changed files with 30 additions and 29 deletions

View File

@@ -7,5 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/107.0.5304.0'
'chromium_checkout': 'refs/tags/107.0.5304.18',
'depot_tools_checkout': 'e3ed6a8e01'
}

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 073ded4a9482b..55edbcad5b2a3 100644
index 6256a29956a8c..9a70f9d6b1036 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
@@ -10,7 +10,7 @@ index 073ded4a9482b..55edbcad5b2a3 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1974,6 +1975,7 @@ static_library("browser") {
@@ -1976,6 +1977,7 @@ static_library("browser") {
"//build/config/chromebox_for_meetings:buildflags",
"//build/config/compiler:compiler_buildflags",
"//cc",
@@ -18,7 +18,7 @@ index 073ded4a9482b..55edbcad5b2a3 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2520,6 +2522,10 @@ static_library("browser") {
@@ -2523,6 +2525,10 @@ static_library("browser") {
]
}
@@ -29,7 +29,7 @@ index 073ded4a9482b..55edbcad5b2a3 100644
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -6349,8 +6355,6 @@ static_library("browser") {
@@ -6353,8 +6359,6 @@ static_library("browser") {
sources += [
"enterprise/chrome_browser_main_extra_parts_enterprise.cc",
"enterprise/chrome_browser_main_extra_parts_enterprise.h",

View File

@@ -13,7 +13,7 @@ index af62c19be9db6..d58f033cffecc 100644
return false;
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 7b4b0ed936514..8949125070a54 100644
index 5924da48d273f..a62a08dd7a8b7 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
@@ -43,7 +43,7 @@ index 7b4b0ed936514..8949125070a54 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -5665,6 +5671,7 @@ static_library("ui") {
@@ -5671,6 +5677,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index d1244c71932df..fab3cb730f084 100644
index bfee1b2e1b139..4dce02bde8165 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -310,6 +310,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -69,7 +69,7 @@ index d1244c71932df..fab3cb730f084 100644
RenderViewContextMenu::GetHandlersForLinkUrl() {
custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers =
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
index 0156137c2853a..ad27c7920e6e7 100644
index 1963c6ed3776d..d302dc4f05bdd 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -127,6 +127,12 @@ class RenderViewContextMenu
@@ -85,7 +85,7 @@ index 0156137c2853a..ad27c7920e6e7 100644
protected:
Profile* GetProfile() const;
@@ -356,6 +362,9 @@ class RenderViewContextMenu
@@ -357,6 +363,9 @@ class RenderViewContextMenu
// built.
bool is_protocol_submenu_valid_ = false;

View File

@@ -324,7 +324,7 @@ index cb93058f317e4..27215441c206c 100644
#endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index 5e72dbd77de9b..40c346953edb0 100644
index 5b8477a22f9a0..e80b94c8822d5 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@
@@ -346,7 +346,7 @@ index 5e72dbd77de9b..40c346953edb0 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1347,6 +1352,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1348,6 +1353,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
SessionDataService::RegisterProfilePrefs(registry);
#endif

View File

@@ -179,10 +179,10 @@ index 195674a56169c..bee591ec8f2f3 100644
BrowserFrame(const BrowserFrame&) = delete;
BrowserFrame& operator=(const BrowserFrame&) = delete;
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index a8e5cd8826ca4..0b958e49730d4 100644
index 60b252ed39816..a8d56495eb539 100644
--- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -305,11 +305,10 @@ using content::NativeWebKeyboardEvent;
@@ -306,11 +306,10 @@ using content::NativeWebKeyboardEvent;
using content::WebContents;
using web_modal::WebContentsModalDialogHost;
@@ -197,7 +197,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
#if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histograms that record animation smoothness for tab loading animation.
@@ -802,11 +801,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
@@ -803,11 +802,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
///////////////////////////////////////////////////////////////////////////////
// BrowserView, public:
@@ -221,7 +221,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
SetShowIcon(
::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
@@ -848,7 +858,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -849,7 +859,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
}
browser_->tab_strip_model()->AddObserver(this);
@@ -229,7 +229,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
// Top container holds tab strip region and toolbar and lives at the front of
// the view hierarchy.
@@ -894,8 +903,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -895,8 +904,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_));
@@ -247,7 +247,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1841,6 +1857,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
@@ -1842,6 +1858,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled())
return false;
@@ -256,7 +256,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
}
@@ -3202,7 +3220,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
@@ -3204,7 +3222,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
if (top_container()->parent() == this)
return;
@@ -266,7 +266,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0);
EnsureFocusOrder();
@@ -3747,8 +3766,10 @@ void BrowserView::Layout() {
@@ -3749,8 +3768,10 @@ void BrowserView::Layout() {
// TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@@ -279,7 +279,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
// Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode.
@@ -3814,6 +3835,11 @@ void BrowserView::AddedToWidget() {
@@ -3816,6 +3837,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif
@@ -291,7 +291,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
toolbar_->Init();
// TODO(pbos): Manage this either inside SidePanel or the corresponding button
@@ -3874,13 +3900,9 @@ void BrowserView::AddedToWidget() {
@@ -3876,13 +3902,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder();
@@ -307,7 +307,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip();
@@ -4296,7 +4318,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
@@ -4298,7 +4320,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false;
ToolbarSizeChanged(false);
@@ -317,7 +317,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
}
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -4638,6 +4661,8 @@ Profile* BrowserView::GetProfile() {
@@ -4640,6 +4663,8 @@ Profile* BrowserView::GetProfile() {
}
void BrowserView::UpdateUIForTabFullscreen() {
@@ -326,7 +326,7 @@ index a8e5cd8826ca4..0b958e49730d4 100644
frame()->GetFrameView()->UpdateFullscreenTopUI();
}
@@ -4660,6 +4685,8 @@ void BrowserView::HideDownloadShelf() {
@@ -4662,6 +4687,8 @@ void BrowserView::HideDownloadShelf() {
}
bool BrowserView::CanUserExitFullscreen() const {
@@ -465,7 +465,7 @@ index 57d5e9f7b4e3c..da7b2d14bae49 100644
}
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index 73869775288dc..524f32d3ae877 100644
index 2ec4ad4c16cdf..6306a8de48d42 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -170,12 +170,13 @@ auto& GetViewCommandMap() {
@@ -494,7 +494,7 @@ index 73869775288dc..524f32d3ae877 100644
size_animation_.Reset(1);
diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
index e597548896482..b9985ed50a2e3 100644
index da32d80ee4f08..8a5e1af098414 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.h
+++ chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -95,7 +95,8 @@ class ToolbarView : public views::AccessiblePaneView,

View File

@@ -42,7 +42,7 @@ index a41ab3c6e50f0..1dd98219869cf 100644
::network::mojom::NetworkContextFilePaths::New();
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index 4c79de32e5f01..9ff92cda4dc3c 100644
index 48a6f90e18d4e..51fe448cd2289 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -549,6 +549,25 @@ void CookieMonster::SetCookieableSchemes(
@@ -72,7 +72,7 @@ index 4c79de32e5f01..9ff92cda4dc3c 100644
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
DCHECK(thread_checker_.CalledOnValidThread());
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
index 0e48488a03aa5..412f09945878d 100644
index 490072c987e95..19a43087e07fa 100644
--- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h
@@ -209,6 +209,8 @@ class NET_EXPORT CookieMonster : public CookieStore {