www/chromium: update to 118.0.5993.70

Security:	https://vuxml.freebsd.org/freebsd/07ee8c14-68f1-11ee-8290-a8a1599412c6.html

1 files changed, 20 insertions, 11 deletions

diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index 2c9994511ef3..811b1a7469a4 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2023-09-13 12:11:42 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2023-10-11 18:22:24 UTC
 +++ chrome/browser/ui/views/frame/browser_frame.cc
 @@ -54,7 +54,7 @@
  #include "components/user_manager/user_manager.h"
@@ -9,8 +9,8 @@
  #include "ui/display/screen.h"
  #include "ui/linux/linux_ui.h"
  #endif
-@@ -66,7 +66,7 @@
- namespace {
+@@ -89,7 +89,7 @@ class ThemeChangedObserver : public views::WidgetObser
+ };
  
  bool IsUsingLinuxSystemTheme(Profile* profile) {
 -#if BUILDFLAG(IS_LINUX)
@@ -18,7 +18,16 @@
    return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
  #else
    return false;
-@@ -319,7 +319,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+@@ -180,7 +180,7 @@ void BrowserFrame::InitBrowserFrame() {
+ 
+   Init(std::move(params));
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Because getting `linux_ui_theme` requires `native_widget_` to be
+   // initialized, this needs to happen after Init().
+   if (!IsIncognitoBrowser() &&
+@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
    chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
    chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
                                             IsVisibleOnAllWorkspaces());
@@ -27,16 +36,16 @@
    // If the window was sent to a different workspace, prioritize it if
    // it was sent to the current workspace and deprioritize it
    // otherwise.  This is done by MoveBrowsersInWorkspaceToFront()
-@@ -547,7 +547,7 @@ void BrowserFrame::SelectNativeTheme() {
-     return;
-   }
+@@ -558,7 +558,7 @@ void BrowserFrame::OnMenuClosed() {
+ }
  
+ void BrowserFrame::SelectNativeTheme() {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const auto* linux_ui_theme =
-       ui::LinuxUiTheme::GetForWindow(GetNativeWindow());
-   // Ignore the system theme for web apps with window-controls-overlay as the
-@@ -564,7 +564,7 @@ void BrowserFrame::SelectNativeTheme() {
+   // Use the regular NativeTheme instance if running incognito mode, regardless
+   // of system theme (gtk, qt etc).
+   ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
+@@ -599,7 +599,7 @@ void BrowserFrame::OnTouchUiChanged() {
  bool BrowserFrame::RegenerateFrameOnThemeChange(
      BrowserThemeChangeType theme_change_type) {
    bool need_regenerate = false;