Update to Chromium version 131.0.6778.0 (#1368529)

2025-01-28 18:19:56 +01:00 · 2024-10-24 11:53:43 -04:00 · 2024-10-24 11:53:43 -04:00 · 173a2f4a58
commit 173a2f4a58
parent 5d817b20a6
35 changed files with 235 additions and 222 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@ -1277,6 +1277,7 @@ make_pack_header("resources") {
    "$root_gen_dir/extensions/grit/extensions_resources.h",
    "$root_gen_dir/mojo/public/js/grit/mojo_bindings_resources.h",
    "$root_gen_dir/net/grit/net_resources.h",
+    "$root_gen_dir/third_party/blink/public/resources/grit/blink_image_resources.h",
    "$root_gen_dir/third_party/blink/public/resources/grit/blink_resources.h",
    "$root_gen_dir/ui/resources/grit/ui_resources.h",
    "$root_gen_dir/ui/resources/grit/webui_resources.h",
@ -1307,6 +1308,7 @@ make_pack_header("resources") {
    "//extensions:extensions_resources_grd",
    "//mojo/public/js:resources",
    "//net:net_resources",
+    "//third_party/blink/public:image_resources",
    "//third_party/blink/public:resources",
    "//ui/resources:ui_resources_grd",
    "//ui/resources:webui_resources_grd",
@ -1329,6 +1331,7 @@ make_pack_header("strings") {
    "$root_gen_dir/extensions/strings/grit/extensions_strings.h",
    "$root_gen_dir/services/strings/grit/services_strings.h",
    "$root_gen_dir/third_party/blink/public/strings/grit/blink_strings.h",
+    "$root_gen_dir/third_party/blink/public/strings/grit/permission_element_strings.h",
    "$root_gen_dir/ui/strings/grit/app_locale_settings.h",
    "$root_gen_dir/ui/strings/grit/auto_image_annotation_strings.h",
    "$root_gen_dir/ui/strings/grit/ui_strings.h",
@ -1347,6 +1350,7 @@ make_pack_header("strings") {
    "//extensions/strings",
    "//services/strings",
    "//third_party/blink/public/strings",
+    "//third_party/blink/public/strings:permission_element_strings",
    "//ui/strings:app_locale_settings",
    "//ui/strings:auto_image_annotation_strings",
    "//ui/strings:ui_strings",
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@ -7,5 +7,5 @@
 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding

 {
-  'chromium_checkout': 'refs/tags/131.0.6768.0'
+  'chromium_checkout': 'refs/tags/131.0.6778.0'
 }
--- a/include/cef_api_hash.h
+++ b/include/cef_api_hash.h
@ -42,13 +42,13 @@
 // way that may cause binary incompatibility with other builds. The universal
 // hash value will change if any platform is affected whereas the platform hash
 // values will change only if that particular platform is affected.
-#define CEF_API_HASH_UNIVERSAL "c03f236dee7038722bce1e8587137769e4290ede"
+#define CEF_API_HASH_UNIVERSAL "548bb305d04b05c0ef29eb2eed88c400e7905ab1"
 #if defined(OS_WIN)
-#define CEF_API_HASH_PLATFORM "105f106d66054db628e6de23af859c4559c8a15e"
+#define CEF_API_HASH_PLATFORM "b73640088f5d35912fcba870607031d8d0a0c33e"
 #elif defined(OS_MAC)
-#define CEF_API_HASH_PLATFORM "5686d730d45e32899319dd79ecf2d6bf1aa7fdb1"
+#define CEF_API_HASH_PLATFORM "01224eb3f2e4bfa18defb3e6d40c93f65231b189"
 #elif defined(OS_LINUX)
-#define CEF_API_HASH_PLATFORM "eff187f603ff3cc18bde522f0d4f90c3c9ddc30e"
+#define CEF_API_HASH_PLATFORM "46107dd79de8c5aab11757980c8951979cc7c266"
 #endif

 #ifdef __cplusplus
--- a/include/internal/cef_types_content_settings.h
+++ b/include/internal/cef_types_content_settings.h
@ -119,8 +119,8 @@ typedef enum {
  /// permission to respond to accessibility events, which can be used to
  /// provide a custom accessibility experience. Requires explicit user consent
  /// because some users may not want sites to know they're using assistive
-  /// technology.
-  CEF_CONTENT_SETTING_TYPE_ACCESSIBILITY_EVENTS,
+  /// technology. Deprecated in M131.
+  CEF_CONTENT_SETTING_TYPE_DEPRECATED_ACCESSIBILITY_EVENTS,

  /// Used to store whether to allow a website to install a payment handler.
  CEF_CONTENT_SETTING_TYPE_PAYMENT_HANDLER,
@ -474,6 +474,10 @@ typedef enum {
  /// Website setting to indicate whether user has opted in to allow web apps to
  /// install other web apps.
  CEF_CONTENT_SETTING_TYPE_WEB_APP_INSTALLATION,
+
+  /// Content settings for private network access in the context of the
+  /// Direct Sockets API.
+  CEF_CONTENT_SETTING_TYPE_DIRECT_SOCKETS_PRIVATE_NETWORK_ACCESS,
 } cef_content_setting_types_t;

 ///
--- a/libcef/browser/chrome/chrome_content_browser_client_cef.cc
+++ b/libcef/browser/chrome/chrome_content_browser_client_cef.cc
@ -200,14 +200,14 @@ void ChromeContentBrowserClientCef::AppendExtraCommandLineSwitches(
    // associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
 #if BUILDFLAG(IS_MAC)
-      switches::kFrameworkDirPath,
-      switches::kMainBundlePath,
+        switches::kFrameworkDirPath,
+        switches::kMainBundlePath,
 #endif
-      switches::kLocalesDirPath,
-      switches::kLogItems,
-      switches::kLogSeverity,
-      switches::kResourcesDirPath,
-      switches::kUserAgentProductAndVersion,
+        switches::kLocalesDirPath,
+        switches::kLogItems,
+        switches::kLogSeverity,
+        switches::kResourcesDirPath,
+        switches::kUserAgentProductAndVersion,
    };
    command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames);
  }
@ -586,7 +586,7 @@ ChromeContentBrowserClientCef::CreateLoginDelegate(
    content::WebContents* web_contents,
    content::BrowserContext* browser_context,
    const content::GlobalRequestID& request_id,
-    bool is_request_for_primary_main_frame,
+    bool is_request_for_primary_main_frame_navigation,
    bool is_request_for_navigation,
    const GURL& url,
    scoped_refptr<net::HttpResponseHeaders> response_headers,
@ -603,8 +603,9 @@ ChromeContentBrowserClientCef::CreateLoginDelegate(

  return ChromeContentBrowserClient::CreateLoginDelegate(
      auth_info, web_contents, browser_context, request_id,
-      is_request_for_primary_main_frame, is_request_for_navigation, url,
-      response_headers, first_auth_attempt, std::move(auth_required_callback));
+      is_request_for_primary_main_frame_navigation, is_request_for_navigation,
+      url, response_headers, first_auth_attempt,
+      std::move(auth_required_callback));
 }

 void ChromeContentBrowserClientCef::ExposeInterfacesToRenderer(
--- a/libcef/browser/chrome/chrome_content_browser_client_cef.h
+++ b/libcef/browser/chrome/chrome_content_browser_client_cef.h
@ -125,7 +125,7 @@ class ChromeContentBrowserClientCef : public ChromeContentBrowserClient {
      content::WebContents* web_contents,
      content::BrowserContext* browser_context,
      const content::GlobalRequestID& request_id,
-      bool is_request_for_primary_main_frame,
+      bool is_request_for_primary_main_frame_navigation,
      bool is_request_for_navigation,
      const GURL& url,
      scoped_refptr<net::HttpResponseHeaders> response_headers,
--- a/libcef/browser/osr/osr_accessibility_util.cc
+++ b/libcef/browser/osr/osr_accessibility_util.cc
@ -79,6 +79,7 @@ struct PopulateAxNodeAttributes {

    switch (attr.first) {
      case ax::mojom::IntAttribute::kNone:
+      case ax::mojom::IntAttribute::kMaxLength:
        break;
      case ax::mojom::IntAttribute::kScrollX:
      case ax::mojom::IntAttribute::kScrollXMin:
--- a/patch/patches/base_sandbox_2743.patch
+++ b/patch/patches/base_sandbox_2743.patch
@ -1,5 +1,5 @@
 diff --git base/BUILD.gn base/BUILD.gn
-index 91b6fad048440..ead9819a9dfc6 100644
+index 4c0e4645f64e3..4ace56138209d 100644
 --- base/BUILD.gn
 +++ base/BUILD.gn
@@ -41,6 +41,7 @@ import("//build/nocompile.gni")
@ -23,7 +23,7 @@ index 91b6fad048440..ead9819a9dfc6 100644
     sources += [
       "hash/md5_nacl.cc",
       "hash/md5_nacl.h",
-@@ -1928,6 +1933,12 @@ component("base") {
+@@ -1934,6 +1939,12 @@ component("base") {
       defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
     }
 
--- a/patch/patches/base_test_4396276.patch
+++ b/patch/patches/base_test_4396276.patch
@ -88,10 +88,10 @@ index f5191b804bc07..aadb7d66ba4c3 100644
 +
 #endif  // BASE_TEST_TEST_TRACE_PROCESSOR_EXPORT_H_
 diff --git content/shell/BUILD.gn content/shell/BUILD.gn
-index ff1d38784abeb..2a29a80a19551 100644
+index 7adc7cdd12c30..0e93b2dfe2f25 100644
 --- content/shell/BUILD.gn
 +++ content/shell/BUILD.gn
-@@ -911,7 +911,6 @@ if (is_mac) {
+@@ -913,7 +913,6 @@ if (is_mac) {
       # Specify a sensible install_name for static builds. The library is
       # dlopen()ed so this is not used to resolve the module.
       ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$output_name.framework/$output_name" ]
--- a/patch/patches/browser_security_policy_1081397.patch
+++ b/patch/patches/browser_security_policy_1081397.patch
@ -20,10 +20,10 @@ index eae60792ce033..6f6641e3fd3dd 100644
 
       // Make an exception to allow most visited tiles to commit in third-party
 diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
-index 16784489df658..1d89a64a98b19 100644
+index 53bba48293111..78fbed7d2c507 100644
 --- content/browser/renderer_host/navigation_request.cc
 +++ content/browser/renderer_host/navigation_request.cc
-@@ -8237,10 +8237,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
+@@ -8245,10 +8245,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
   bool use_opaque_origin =
       (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
       network::mojom::WebSandboxFlags::kOrigin;
@ -47,7 +47,7 @@ index 16784489df658..1d89a64a98b19 100644
   }
 
   return origin_and_debug_info;
-@@ -8348,11 +8360,20 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
+@@ -8356,11 +8368,20 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
       DetermineInitiatorRelationship(initiator_rfh,
                                      frame_tree_node_->current_frame_host()));
 
--- a/patch/patches/build.patch
+++ b/patch/patches/build.patch
@ -1,5 +1,5 @@
 diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
-index 1c3802fa1b580..48e8316090fe6 100644
+index f1627512b3212..b9bdd63daae7d 100644
 --- build/config/compiler/BUILD.gn
 +++ build/config/compiler/BUILD.gn
@@ -133,6 +133,9 @@ declare_args() {
@ -12,7 +12,7 @@ index 1c3802fa1b580..48e8316090fe6 100644
   # Initialize all local variables with a pattern. This flag will fill
   # uninitialized floating-point types (and 32-bit pointers) with 0xFF and the
   # rest with 0xAA. This makes behavior of uninitialized memory bugs consistent,
-@@ -2263,11 +2266,13 @@ config("export_dynamic") {
+@@ -2268,11 +2271,13 @@ config("export_dynamic") {
 config("thin_archive") {
   # The macOS and iOS default linker ld64 does not support reading thin
   # archives.
--- a/patch/patches/chrome_browser.patch
+++ b/patch/patches/chrome_browser.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
-index 23e21f1ff0771..47df752caa9fb 100644
+index d64fdb1c1bf43..954280f1c02e5 100644
 --- chrome/browser/BUILD.gn
 +++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/compiler/pgo/pgo.gni")
@ -10,7 +10,7 @@ index 23e21f1ff0771..47df752caa9fb 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/browser/downgrade/buildflags.gni")
 import("//chrome/browser/request_header_integrity/buildflags.gni")
-@@ -1855,6 +1856,7 @@ static_library("browser") {
+@@ -1849,6 +1850,7 @@ static_library("browser") {
     "//build/config/chromebox_for_meetings:buildflags",
     "//build/config/compiler:compiler_buildflags",
     "//cc",
@ -18,7 +18,7 @@ index 23e21f1ff0771..47df752caa9fb 100644
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
-@@ -2525,6 +2527,10 @@ static_library("browser") {
+@@ -2522,6 +2524,10 @@ static_library("browser") {
     ]
   }
 
--- a/patch/patches/chrome_browser_browser.patch
+++ b/patch/patches/chrome_browser_browser.patch
@ -88,7 +88,7 @@ index 2900434a50cf1..a2e8c6161ced2 100644
 }
 
 diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
-index f4a53774c709f..e12292ce25360 100644
+index 33631fd4086bf..25f16fe25b14e 100644
 --- chrome/browser/ui/BUILD.gn
 +++ chrome/browser/ui/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
@ -118,7 +118,7 @@ index f4a53774c709f..e12292ce25360 100644
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/app:chrome_dll_resources",
-@@ -692,6 +698,10 @@ static_library("ui") {
+@@ -694,6 +700,10 @@ static_library("ui") {
     deps += [ "//components/plus_addresses/resources:vector_icons" ]
   }
 
@ -129,7 +129,7 @@ index f4a53774c709f..e12292ce25360 100644
   # TODO(crbug.com/41437292): Remove this circular dependency.
   # Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies".
   # These are all-platform circular includes.
-@@ -5505,6 +5515,7 @@ static_library("ui") {
+@@ -5509,6 +5519,7 @@ static_library("ui") {
   if (enable_printing) {
     deps += [
       "//components/printing/browser",
@ -138,7 +138,7 @@ index f4a53774c709f..e12292ce25360 100644
     ]
   }
 diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
-index ccbe26ac35c30..a98e48ca874e1 100644
+index e87612be40627..41f088fd227b7 100644
 --- chrome/browser/ui/browser.cc
 +++ chrome/browser/ui/browser.cc
@@ -273,6 +273,25 @@
@ -191,7 +191,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-@@ -1318,6 +1347,8 @@ void Browser::WindowFullscreenStateChanged() {
+@@ -1329,6 +1358,8 @@ void Browser::WindowFullscreenStateChanged() {
       ->WindowFullscreenStateChanged();
   command_controller_->FullscreenStateChanged();
   UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
@ -200,7 +200,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
 }
 
 void Browser::FullscreenTopUIStateChanged() {
-@@ -1648,6 +1679,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
+@@ -1659,6 +1690,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
   if (exclusive_access_manager_->HandleUserKeyEvent(event))
     return content::KeyboardEventProcessingResult::HANDLED;
 
@ -215,7 +215,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
   return window()->PreHandleKeyboardEvent(event);
 }
 
-@@ -1655,8 +1694,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
+@@ -1666,8 +1705,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
                                   const NativeWebKeyboardEvent& event) {
   DevToolsWindow* devtools_window =
       DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -236,7 +236,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
 }
 
 bool Browser::TabsNeedBeforeUnloadFired() const {
-@@ -1811,6 +1860,14 @@ WebContents* Browser::OpenURLFromTab(
+@@ -1822,6 +1871,14 @@ WebContents* Browser::OpenURLFromTab(
                                   std::move(navigation_handle_callback));
   }
 
@ -251,7 +251,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
   NavigateParams nav_params(this, params.url, params.transition);
   nav_params.FillNavigateParamsFromOpenURLParams(params);
   nav_params.source_contents = source;
-@@ -1977,6 +2034,8 @@ void Browser::LoadingStateChanged(WebContents* source,
+@@ -1988,6 +2045,8 @@ void Browser::LoadingStateChanged(WebContents* source,
                                   bool should_show_loading_ui) {
   ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
   UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@ -260,7 +260,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
 }
 
 void Browser::CloseContents(WebContents* source) {
-@@ -2005,6 +2064,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
+@@ -2016,6 +2075,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
 }
 
 void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -269,7 +269,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
   if (!GetStatusBubble())
     return;
 
-@@ -2012,6 +2073,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
+@@ -2023,6 +2084,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
     GetStatusBubble()->SetURL(url);
 }
 
@ -287,7 +287,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
 void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) {
   const ui::EventType type = event.type();
   const bool exited = type == ui::EventType::kMouseExited;
-@@ -2040,6 +2112,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
+@@ -2051,6 +2123,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
   return false;
 }
 
@ -307,7 +307,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
 void Browser::BeforeUnloadFired(WebContents* web_contents,
                                 bool proceed,
                                 bool* proceed_to_fire_unload) {
-@@ -2139,12 +2224,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
+@@ -2150,12 +2235,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
 
   // Make the tab show up in the task manager.
   task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -332,7 +332,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
   // Don't show the page hung dialog when a HTML popup hangs because
   // the dialog will take the focus and immediately close the popup.
   RenderWidgetHostView* view = render_widget_host->GetView();
-@@ -2157,6 +2254,13 @@ void Browser::RendererUnresponsive(
+@@ -2168,6 +2265,13 @@ void Browser::RendererUnresponsive(
 void Browser::RendererResponsive(
     WebContents* source,
     content::RenderWidgetHost* render_widget_host) {
@ -346,7 +346,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
   RenderWidgetHostView* view = render_widget_host->GetView();
   if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) {
     TabDialogs::FromWebContents(source)->HideHungRendererDialog(
-@@ -2166,6 +2270,15 @@ void Browser::RendererResponsive(
+@@ -2177,6 +2281,15 @@ void Browser::RendererResponsive(
 
 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
     WebContents* source) {
@ -362,7 +362,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
   return javascript_dialogs::TabModalDialogManager::FromWebContents(source);
 }
 
-@@ -2201,6 +2314,11 @@ void Browser::DraggableRegionsChanged(
+@@ -2212,6 +2325,11 @@ void Browser::DraggableRegionsChanged(
   if (app_controller_) {
     app_controller_->DraggableRegionsChanged(regions, contents);
   }
@ -374,7 +374,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
 }
 
 void Browser::DidFinishNavigation(
-@@ -2281,11 +2399,15 @@ void Browser::EnterFullscreenModeForTab(
+@@ -2292,11 +2410,15 @@ void Browser::EnterFullscreenModeForTab(
     const blink::mojom::FullscreenOptions& options) {
   exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
       requesting_frame, options.display_id);
@ -390,7 +390,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
 }
 
 bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
-@@ -2488,6 +2610,15 @@ void Browser::RequestMediaAccessPermission(
+@@ -2499,6 +2621,15 @@ void Browser::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     content::MediaResponseCallback callback) {
@ -406,7 +406,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
   const extensions::Extension* extension =
       GetExtensionForOrigin(profile_, request.security_origin);
   MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
-@@ -3048,9 +3179,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
+@@ -3059,9 +3190,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
 // Browser, Getters for UI (private):
 
 StatusBubble* Browser::GetStatusBubble() {
@ -418,7 +418,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
   }
 
   // We hide the status bar for web apps windows as this matches native
-@@ -3058,6 +3190,12 @@ StatusBubble* Browser::GetStatusBubble() {
+@@ -3069,6 +3201,12 @@ StatusBubble* Browser::GetStatusBubble() {
   // mode, as the minimal browser UI includes the status bar.
   if (web_app::AppBrowserController::IsWebApp(this) &&
       !app_controller()->HasMinimalUiButtons()) {
@ -431,7 +431,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
     return nullptr;
   }
 
-@@ -3207,6 +3345,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
+@@ -3218,6 +3356,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
     BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
     web_contents_collection_.StopObserving(web_contents);
   }
@ -440,7 +440,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
 }
 
 void Browser::TabDetachedAtImpl(content::WebContents* contents,
-@@ -3361,6 +3501,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
+@@ -3372,6 +3512,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
 
 bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
                                         bool check_can_support) const {
@ -456,7 +456,7 @@ index ccbe26ac35c30..a98e48ca874e1 100644
     case TYPE_NORMAL:
       return NormalBrowserSupportsWindowFeature(feature, check_can_support);
 diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
-index c4eb05c6194b3..22c800d52a269 100644
+index 86ea151056ca1..680d143eecb16 100644
 --- chrome/browser/ui/browser.h
 +++ chrome/browser/ui/browser.h
@@ -24,6 +24,7 @@
@ -521,7 +521,7 @@ index c4eb05c6194b3..22c800d52a269 100644
   // Get the FindBarController for this browser, creating it if it does not
   // yet exist.
   FindBarController* GetFindBarController();
-@@ -955,10 +982,18 @@ class Browser : public TabStripModelObserver,
+@@ -956,10 +983,18 @@ class Browser : public TabStripModelObserver,
   void SetContentsBounds(content::WebContents* source,
                          const gfx::Rect& bounds) override;
   void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -540,7 +540,7 @@ index c4eb05c6194b3..22c800d52a269 100644
   void BeforeUnloadFired(content::WebContents* source,
                          bool proceed,
                          bool* proceed_to_fire_unload) override;
-@@ -1295,6 +1330,10 @@ class Browser : public TabStripModelObserver,
+@@ -1296,6 +1331,10 @@ class Browser : public TabStripModelObserver,
   // This Browser's window.
   raw_ptr<BrowserWindow, DanglingUntriaged> window_;
 
@ -551,7 +551,7 @@ index c4eb05c6194b3..22c800d52a269 100644
   std::unique_ptr<TabStripModelDelegate> const tab_strip_model_delegate_;
   std::unique_ptr<TabStripModel> const tab_strip_model_;
 
-@@ -1361,6 +1400,8 @@ class Browser : public TabStripModelObserver,
+@@ -1362,6 +1401,8 @@ class Browser : public TabStripModelObserver,
   const std::string initial_workspace_;
   bool initial_visible_on_all_workspaces_state_;
 
--- a/patch/patches/chrome_browser_context_menus.patch
+++ b/patch/patches/chrome_browser_context_menus.patch
@ -1,8 +1,8 @@
 diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
-index 4f655f74e289d..2c119831b6cd2 100644
+index db228a497bd28..94e04bca7e28d 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -361,6 +361,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
+@@ -360,6 +360,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
   return callback.get();
 }
 
@ -21,7 +21,7 @@ index 4f655f74e289d..2c119831b6cd2 100644
 enum class UmaEnumIdLookupType {
   GeneralEnumId,
   ContextSpecificEnumId,
-@@ -629,6 +641,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
+@@ -628,6 +640,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
     return 1;
   }
 
@ -32,7 +32,7 @@ index 4f655f74e289d..2c119831b6cd2 100644
   id = CollapseCommandsForUMA(id);
   const auto& map = GetIdcToUmaMap(type);
   auto it = map.find(id);
-@@ -910,6 +926,14 @@ RenderViewContextMenu::RenderViewContextMenu(
+@@ -909,6 +925,14 @@ RenderViewContextMenu::RenderViewContextMenu(
                     : nullptr;
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
@ -47,7 +47,7 @@ index 4f655f74e289d..2c119831b6cd2 100644
   observers_.AddObserver(&autofill_context_menu_manager_);
 }
 
-@@ -1366,6 +1390,12 @@ void RenderViewContextMenu::InitMenu() {
+@@ -1365,6 +1389,12 @@ void RenderViewContextMenu::InitMenu() {
     autofill_client->HideAutofillSuggestions(
         autofill::SuggestionHidingReason::kContextMenuOpened);
   }
@ -60,7 +60,7 @@ index 4f655f74e289d..2c119831b6cd2 100644
 }
 
 Profile* RenderViewContextMenu::GetProfile() const {
-@@ -3667,6 +3697,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
+@@ -3648,6 +3678,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
   execute_plugin_action_callback_ = std::move(cb);
 }
 
@ -88,7 +88,7 @@ index 4f655f74e289d..2c119831b6cd2 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 91de5780521af..571ad0260b4f7 100644
+index 0266119ae4010..d7e04a4e3804d 100644
 --- chrome/browser/renderer_context_menu/render_view_context_menu.h
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -153,7 +153,21 @@ class RenderViewContextMenu
@ -113,7 +113,7 @@ index 91de5780521af..571ad0260b4f7 100644
   Profile* GetProfile() const;
 
   // This may return nullptr (e.g. for WebUI dialogs). Virtual to allow tests to
-@@ -478,6 +492,9 @@ class RenderViewContextMenu
+@@ -477,6 +491,9 @@ class RenderViewContextMenu
   //   built.
   bool is_protocol_submenu_valid_ = false;
 
--- a/patch/patches/chrome_browser_extensions.patch
+++ b/patch/patches/chrome_browser_extensions.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/extensions/api/chrome_extensions_api_client.cc chrome/browser/extensions/api/chrome_extensions_api_client.cc
-index d1efdcb11d925..87fbfde83af42 100644
+index 66ea000f8c048..02eeb15adceed 100644
 --- chrome/browser/extensions/api/chrome_extensions_api_client.cc
 +++ chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -15,6 +15,7 @@
@ -10,7 +10,7 @@ index d1efdcb11d925..87fbfde83af42 100644
 #include "chrome/browser/extensions/api/automation_internal/chrome_automation_internal_api_delegate.h"
 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
 #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h"
-@@ -93,6 +94,10 @@
+@@ -86,6 +87,10 @@
 #include "chrome/browser/extensions/clipboard_extension_helper_chromeos.h"
 #endif
 
@ -21,7 +21,7 @@ index d1efdcb11d925..87fbfde83af42 100644
 #if BUILDFLAG(ENABLE_PRINTING)
 #include "chrome/browser/printing/printing_init.h"
 #endif
-@@ -316,7 +321,11 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate() const {
+@@ -309,7 +314,11 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate() const {
 std::unique_ptr<MimeHandlerViewGuestDelegate>
 ChromeExtensionsAPIClient::CreateMimeHandlerViewGuestDelegate(
     MimeHandlerViewGuest* guest) const {
@ -34,10 +34,10 @@ index d1efdcb11d925..87fbfde83af42 100644
 
 WebViewGuestDelegate* ChromeExtensionsAPIClient::CreateWebViewGuestDelegate(
 diff --git chrome/browser/extensions/api/tabs/tabs_api.cc chrome/browser/extensions/api/tabs/tabs_api.cc
-index 14af722d7e382..c86b9f28689cc 100644
+index d0ec6330ae8c1..c9e2857fa06b4 100644
 --- chrome/browser/extensions/api/tabs/tabs_api.cc
 +++ chrome/browser/extensions/api/tabs/tabs_api.cc
-@@ -1615,7 +1615,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
+@@ -1603,7 +1603,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
       return RespondNow(Error(ExtensionTabUtil::kTabStripNotEditableError));
     }
 
@ -46,7 +46,7 @@ index 14af722d7e382..c86b9f28689cc 100644
       tab_strip->ActivateTabAt(tab_index);
       DCHECK_EQ(contents, tab_strip->GetActiveWebContents());
     }
-@@ -1629,7 +1629,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
+@@ -1617,7 +1617,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
     }
 
     bool highlighted = *params->update_properties.highlighted;
@ -55,7 +55,7 @@ index 14af722d7e382..c86b9f28689cc 100644
       tab_strip->ToggleSelectionAt(tab_index);
     }
   }
-@@ -1641,7 +1641,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
+@@ -1629,7 +1629,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
         kCannotUpdateMuteCaptured, base::NumberToString(tab_id))));
   }
 
@ -64,7 +64,7 @@ index 14af722d7e382..c86b9f28689cc 100644
     int opener_id = *params->update_properties.opener_tab_id;
     WebContents* opener_contents = nullptr;
     if (opener_id == tab_id) {
-@@ -1676,7 +1676,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
+@@ -1664,7 +1664,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
         ->SetAutoDiscardable(state);
   }
 
@ -73,7 +73,7 @@ index 14af722d7e382..c86b9f28689cc 100644
     // Bug fix for crbug.com/1197888. Don't let the extension update the tab if
     // the user is dragging tabs.
     if (!ExtensionTabUtil::IsTabStripEditable()) {
-@@ -1697,8 +1697,9 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
+@@ -1685,8 +1685,9 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
   // Navigate the tab to a new location if the url is different.
   if (params->update_properties.url) {
     std::string updated_url = *params->update_properties.url;
@ -85,7 +85,7 @@ index 14af722d7e382..c86b9f28689cc 100644
       return RespondNow(Error(ErrorUtils::FormatErrorMessage(
           tabs_constants::kURLsNotAllowedInIncognitoError, updated_url)));
     }
-@@ -1712,7 +1713,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
+@@ -1700,7 +1701,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
       return RespondNow(Error(std::move(error)));
     }
 
--- a/patch/patches/chrome_browser_safe_browsing.patch
+++ b/patch/patches/chrome_browser_safe_browsing.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
-index 386e4b6b6e8a9..85b7e2b926e9c 100644
+index 19cc1b47ecf4a..56b0e471ff37a 100644
 --- chrome/browser/safe_browsing/BUILD.gn
 +++ chrome/browser/safe_browsing/BUILD.gn
@@ -39,6 +39,7 @@ static_library("safe_browsing") {
--- a/patch/patches/chrome_browser_webui_license.patch
+++ b/patch/patches/chrome_browser_webui_license.patch
@ -69,7 +69,7 @@ index 6548d519c3da9..645163f69f822 100644
 // chrome://terms
 class TermsUIConfig : public AboutUIConfigBase {
 diff --git chrome/browser/ui/webui/chrome_web_ui_configs.cc chrome/browser/ui/webui/chrome_web_ui_configs.cc
-index 089e3b7bfe055..ce5550a60b1dc 100644
+index a1f43d79b6f9b..281ee1e2c8a41 100644
 --- chrome/browser/ui/webui/chrome_web_ui_configs.cc
 +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -6,6 +6,7 @@
@ -80,7 +80,7 @@ index 089e3b7bfe055..ce5550a60b1dc 100644
 #include "chrome/browser/ui/webui/about/about_ui.h"
 #include "chrome/browser/ui/webui/accessibility/accessibility_ui.h"
 #include "chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.h"
-@@ -207,6 +208,9 @@ void RegisterChromeWebUIConfigs() {
+@@ -211,6 +212,9 @@ void RegisterChromeWebUIConfigs() {
   map.AddWebUIConfig(std::make_unique<BrowsingTopicsInternalsUIConfig>());
   map.AddWebUIConfig(std::make_unique<chromeos::DeviceLogUIConfig>());
   map.AddWebUIConfig(std::make_unique<ChromeURLsUIConfig>());
@ -127,7 +127,7 @@ index 248b6795e8cbe..c957f9d55613d 100644
 #if !BUILDFLAG(IS_ANDROID)
       kChromeUIManagementHost,
 diff --git chrome/common/webui_url_constants.h chrome/common/webui_url_constants.h
-index 77a617a6aac5a..6ecbed02d00f6 100644
+index 9fa26adc16d4f..32635f37b8846 100644
 --- chrome/common/webui_url_constants.h
 +++ chrome/common/webui_url_constants.h
@@ -18,6 +18,7 @@
--- a/patch/patches/chrome_runtime.patch
+++ b/patch/patches/chrome_runtime.patch
@ -1,5 +1,5 @@
 diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
-index 2fb2eb68d328b..f616ba827ea03 100644
+index a419367526923..d06e0e2f5b09a 100644
 --- chrome/app/chrome_main_delegate.cc
 +++ chrome/app/chrome_main_delegate.cc
@@ -42,6 +42,7 @@
@ -10,7 +10,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
 #include "chrome/browser/buildflags.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_resource_bundle_helper.h"
-@@ -574,6 +575,7 @@ struct MainFunction {
+@@ -573,6 +574,7 @@ struct MainFunction {
   int (*function)(content::MainFunctionParams);
 };
 
@ -18,7 +18,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
 // Initializes the user data dir. Must be called before InitializeLocalState().
 void InitializeUserDataDir(base::CommandLine* command_line) {
 #if BUILDFLAG(IS_CHROMEOS_LACROS)
-@@ -657,6 +659,7 @@ void InitializeUserDataDir(base::CommandLine* command_line) {
+@@ -656,6 +658,7 @@ void InitializeUserDataDir(base::CommandLine* command_line) {
     command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir);
 #endif  // BUILDFLAG(IS_WIN)
 }
@ -26,7 +26,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
 
 #if !BUILDFLAG(IS_ANDROID)
 void InitLogging(const std::string& process_type) {
-@@ -789,6 +792,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
+@@ -788,6 +791,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
 ChromeMainDelegate::~ChromeMainDelegate() = default;
 #endif  // !BUILDFLAG(IS_ANDROID)
 
@ -37,7 +37,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
 std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
     InvokedIn invoked_in) {
   DUMP_WILL_BE_CHECK(base::ThreadPoolInstance::Get());
-@@ -814,7 +821,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
+@@ -813,7 +820,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
     // future session's metrics.
     DeferBrowserMetrics(user_data_dir);
 
@ -46,7 +46,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
     // In the case the process is not the singleton process, the uninstall tasks
     // need to be executed here. A window will be displayed asking to close all
     // running instances.
-@@ -961,7 +968,8 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
+@@ -960,7 +967,8 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
 
   // Initializes the resource bundle and determines the locale.
   std::string actual_locale = LoadLocalState(
@ -56,7 +56,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
   chrome_feature_list_creator->SetApplicationLocale(actual_locale);
   chrome_feature_list_creator->OverrideCachedUIStrings();
 
-@@ -978,6 +986,8 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
+@@ -977,6 +985,8 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
       new net::NetworkChangeNotifierFactoryAndroid());
 #endif
 
@ -65,7 +65,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
   if (base::FeatureList::IsEnabled(
           features::kWriteBasicSystemProfileToPersistentHistogramsFile)) {
     bool record = true;
-@@ -988,6 +998,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
+@@ -987,6 +997,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
     if (record)
       chrome_content_browser_client_->startup_data()->RecordCoreSystemProfile();
   }
@ -73,7 +73,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
 
 #if BUILDFLAG(IS_ANDROID)
   UmaSessionStats::OnStartup();
-@@ -1031,8 +1042,8 @@ void ChromeMainDelegate::CreateThreadPool(std::string_view name) {
+@@ -1030,8 +1041,8 @@ void ChromeMainDelegate::CreateThreadPool(std::string_view name) {
       std::make_unique<ChromeThreadProfilerClient>());
 
 // `ChromeMainDelegateAndroid::PreSandboxStartup` creates the profiler a little
@ -84,7 +84,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
   // Start the sampling profiler as early as possible - namely, once the thread
   // pool has been created.
   sampling_profiler_ = std::make_unique<MainThreadStackSamplingProfiler>();
-@@ -1439,6 +1450,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1438,6 +1449,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
@ -92,7 +92,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
   crash_reporter::InitializeCrashKeys();
 
 #if BUILDFLAG(IS_POSIX)
-@@ -1454,6 +1466,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1453,6 +1465,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   if (chrome::ProcessNeedsProfileDir(process_type)) {
     InitializeUserDataDir(base::CommandLine::ForCurrentProcess());
   }
@ -100,7 +100,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
 
 #if BUILDFLAG(IS_CHROMEOS_LACROS)
   // Generate shared resource file only on browser process. This is to avoid
-@@ -1605,7 +1618,8 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1604,7 +1617,8 @@ void ChromeMainDelegate::PreSandboxStartup() {
 #else
     const std::string loaded_locale =
         ui::ResourceBundle::InitSharedInstanceWithLocale(
@ -110,7 +110,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
 
     base::FilePath resources_pack_path;
     base::PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
-@@ -1635,6 +1649,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1634,6 +1648,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
     CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
   }
 
@ -118,7 +118,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
 #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
   // Zygote needs to call InitCrashReporter() in RunZygote().
   if (process_type != switches::kZygoteProcess &&
-@@ -1671,6 +1686,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1670,6 +1685,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   // After all the platform Breakpads have been initialized, store the command
   // line for crash reporting.
   crash_keys::SetCrashKeysFromCommandLine(command_line);
@ -126,7 +126,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
 
 #if BUILDFLAG(ENABLE_PDF)
   MaybePatchGdiGetFontData();
-@@ -1791,6 +1807,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1790,6 +1806,7 @@ void ChromeMainDelegate::ZygoteForked() {
     SetUpProfilingShutdownHandler();
   }
 
@ -134,7 +134,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
   // this up for the browser process in a different manner.
   const base::CommandLine* command_line =
-@@ -1803,6 +1820,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1802,6 +1819,7 @@ void ChromeMainDelegate::ZygoteForked() {
 
   // Reset the command line for the newly spawned process.
   crash_keys::SetCrashKeysFromCommandLine(*command_line);
@ -142,7 +142,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
 }
 
 #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1913,6 +1931,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
+@@ -1912,6 +1930,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
                              : memory_system::DispatcherParameters::
                                    AllocationTraceRecorderInclusion::kIgnore;
 
@ -150,7 +150,7 @@ index 2fb2eb68d328b..f616ba827ea03 100644
   memory_system::Initializer()
       .SetGwpAsanParameters(gwp_asan_boost_sampling, process_type)
       .SetProfilingClientParameters(chrome::GetChannel(),
-@@ -1920,5 +1939,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
+@@ -1919,5 +1938,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
       .SetDispatcherParameters(memory_system::DispatcherParameters::
                                    PoissonAllocationSamplerInclusion::kEnforce,
                                allocation_recorder_inclusion, process_type)
@ -232,7 +232,7 @@ index ac1361bd6bc2e..a303ca169c7f7 100644
 
     base::PathService::OverrideAndCreateIfNeeded(
 diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
-index a39ad24ec4f13..184c4532aa88f 100644
+index 5b89cf0e9a761..8bf832888bd53 100644
 --- chrome/browser/chrome_browser_main.cc
 +++ chrome/browser/chrome_browser_main.cc
@@ -52,6 +52,7 @@
@ -465,7 +465,7 @@ index e26e3625c99c8..c0d4a95607e37 100644
 +#endif
 }
 diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
-index 3ca6369dd6981..351d5e20dade6 100644
+index e389b440fa666..88a1e390cb9e2 100644
 --- chrome/browser/chrome_content_browser_client.cc
 +++ chrome/browser/chrome_content_browser_client.cc
@@ -48,6 +48,7 @@
@ -476,7 +476,7 @@ index 3ca6369dd6981..351d5e20dade6 100644
 #include "chrome/browser/after_startup_task_utils.h"
 #include "chrome/browser/ai/ai_manager_keyed_service_factory.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
-@@ -1514,6 +1515,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
+@@ -1515,6 +1516,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
 }
 
 ChromeContentBrowserClient::ChromeContentBrowserClient() {
@ -485,7 +485,7 @@ index 3ca6369dd6981..351d5e20dade6 100644
 #if BUILDFLAG(ENABLE_PLUGINS)
   extra_parts_.push_back(
       std::make_unique<ChromeContentBrowserClientPluginsPart>());
-@@ -1551,6 +1554,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
+@@ -1552,6 +1555,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
   }
 }
 
@ -497,7 +497,7 @@ index 3ca6369dd6981..351d5e20dade6 100644
 // static
 void ChromeContentBrowserClient::RegisterLocalStatePrefs(
     PrefRegistrySimple* registry) {
-@@ -3969,28 +3977,25 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs,
+@@ -3966,28 +3974,25 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs,
         web_prefs->preferred_color_scheme;
   }
 #else
@ -543,7 +543,7 @@ index 3ca6369dd6981..351d5e20dade6 100644
 #endif  // BUILDFLAG(IS_ANDROID)
 
   // Reauth WebUI doesn't support dark mode yet because it shares the dialog
-@@ -4744,9 +4749,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
+@@ -4741,9 +4746,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
                           &search::HandleNewTabURLReverseRewrite);
 #endif  // BUILDFLAG(IS_ANDROID)
 
@ -555,7 +555,7 @@ index 3ca6369dd6981..351d5e20dade6 100644
 }
 
 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
-@@ -6883,7 +6890,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
+@@ -6880,7 +6887,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
 #endif
 }
 
@ -564,7 +564,7 @@ index 3ca6369dd6981..351d5e20dade6 100644
     content::BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
-@@ -6901,6 +6908,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
+@@ -6898,6 +6905,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
     network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
     network_context_params->accept_language = GetApplicationLocale();
   }
@ -573,7 +573,7 @@ index 3ca6369dd6981..351d5e20dade6 100644
 }
 
 std::vector<base::FilePath>
-@@ -8063,11 +8072,11 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
+@@ -8060,11 +8069,11 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
   const auto now = base::TimeTicks::Now();
   const auto timeout = GetKeepaliveTimerTimeout(context);
   keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -587,7 +587,7 @@ index 3ca6369dd6981..351d5e20dade6 100644
           FROM_HERE, keepalive_deadline_ - now,
           base::BindOnce(
               &ChromeContentBrowserClient::OnKeepaliveTimerFired,
-@@ -8089,7 +8098,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
+@@ -8086,7 +8095,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
   --num_keepalive_requests_;
   if (num_keepalive_requests_ == 0) {
     DVLOG(1) << "Stopping the keepalive timer";
@ -597,7 +597,7 @@ index 3ca6369dd6981..351d5e20dade6 100644
     // This deletes the keep alive handle attached to the timer function and
     // unblock the shutdown sequence.
   }
-@@ -8263,7 +8273,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
+@@ -8260,7 +8270,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
   const auto now = base::TimeTicks::Now();
   const auto then = keepalive_deadline_;
   if (now < then) {
@ -607,7 +607,7 @@ index 3ca6369dd6981..351d5e20dade6 100644
         base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired,
                        weak_factory_.GetWeakPtr(),
 diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
-index b33a4b957d997..57942809579bf 100644
+index 8f3e428979146..a29e251d492ab 100644
 --- chrome/browser/chrome_content_browser_client.h
 +++ chrome/browser/chrome_content_browser_client.h
@@ -149,6 +149,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@ -638,7 +638,7 @@ index b33a4b957d997..57942809579bf 100644
 #endif
 
 diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
-index f74be30365805..74be892e89645 100644
+index 3e27913d47dc7..b727904f17ae6 100644
 --- chrome/browser/prefs/browser_prefs.cc
 +++ chrome/browser/prefs/browser_prefs.cc
@@ -16,6 +16,7 @@
@ -660,7 +660,7 @@ index f74be30365805..74be892e89645 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/accessibility/animation_policy_prefs.h"
 #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
-@@ -1863,7 +1868,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1888,7 +1893,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
 #endif  // BUILDFLAG(IS_WIN)
 
@ -670,7 +670,7 @@ index f74be30365805..74be892e89645 100644
   downgrade::RegisterPrefs(registry);
 #endif
 
-@@ -1916,6 +1922,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1941,6 +1947,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 
   // This is intentionally last.
   RegisterLocalStatePrefsForMigration(registry);
@ -682,7 +682,7 @@ index f74be30365805..74be892e89645 100644
 }
 
 // Register prefs applicable to all profiles.
-@@ -2368,6 +2379,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2390,6 +2401,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
                               const std::string& locale) {
   RegisterProfilePrefs(registry, locale);
 
--- a/patch/patches/chrome_runtime_views.patch
+++ b/patch/patches/chrome_runtime_views.patch
@ -41,7 +41,7 @@ index 14e7065d7dbd6..b01501b4253a3 100644
 
 void BrowserCommandController::InitCommandState() {
 diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
-index feb6d2e1f5ab1..a65e1c938c116 100644
+index 32f5ef6e5ac36..6b82915434afe 100644
 --- chrome/browser/ui/toolbar/app_menu_model.cc
 +++ chrome/browser/ui/toolbar/app_menu_model.cc
@@ -717,10 +717,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel(
@ -115,7 +115,7 @@ index feb6d2e1f5ab1..a65e1c938c116 100644
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
-@@ -1700,7 +1753,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
+@@ -1701,7 +1754,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
   return false;
 }
 
@ -124,7 +124,7 @@ index feb6d2e1f5ab1..a65e1c938c116 100644
   GlobalError* error =
       GlobalErrorServiceFactory::GetForProfile(browser_->profile())
           ->GetGlobalErrorByMenuItemCommandID(command_id);
-@@ -1716,6 +1769,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
+@@ -1717,6 +1770,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
   }
 }
 
@ -155,7 +155,7 @@ index feb6d2e1f5ab1..a65e1c938c116 100644
 bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
   if (command_id == IDC_VIEW_PASSWORDS ||
       command_id == IDC_SHOW_PASSWORD_MANAGER) {
-@@ -1872,8 +1949,10 @@ void AppMenuModel::Build() {
+@@ -1873,8 +1950,10 @@ void AppMenuModel::Build() {
                                    IDS_CLEAR_BROWSING_DATA,
                                    kTrashCanRefreshIcon);
 
@ -166,7 +166,7 @@ index feb6d2e1f5ab1..a65e1c938c116 100644
   AddSeparator(ui::NORMAL_SEPARATOR);
 
   AddItemWithStringIdAndVectorIcon(this, IDC_PRINT, IDS_PRINT, kPrintMenuIcon);
-@@ -1976,6 +2055,11 @@ void AppMenuModel::Build() {
+@@ -1977,6 +2056,11 @@ void AppMenuModel::Build() {
   }
 #endif  // !BUILDFLAG(IS_CHROMEOS_ASH)
 
@ -397,10 +397,10 @@ index 532705a04c47b..0272f27596df6 100644
   // regenerated.
   bool RegenerateFrameOnThemeChange(BrowserThemeChangeType theme_change_type);
 diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
-index 3b1fa8ba79fcb..77e681c8cbdc0 100644
+index 8c08f4c3f10fa..721a7b1d5f136 100644
 --- chrome/browser/ui/views/frame/browser_view.cc
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -367,10 +367,6 @@ constexpr base::FeatureParam<base::TimeDelta> kLoadingTabAnimationFrameDelay = {
+@@ -366,10 +366,6 @@ constexpr base::FeatureParam<base::TimeDelta> kLoadingTabAnimationFrameDelay = {
     &kChangeFrameRateOfLoadingTabAnimation, "loading_tab_animation_frame_delay",
     base::Milliseconds(30)};
 
@ -411,7 +411,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 // UMA histograms that record animation smoothness for tab loading animation.
 constexpr char kTabLoadingSmoothnessHistogramName[] =
-@@ -770,6 +766,14 @@ class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate {
+@@ -769,6 +765,14 @@ class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate {
     return browser_view_->frame()->GetTopInset() - browser_view_->y();
   }
 
@ -426,7 +426,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
   bool IsToolbarVisible() const override {
     return browser_view_->IsToolbarVisible();
   }
-@@ -921,11 +925,21 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
+@@ -920,11 +924,21 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, public:
 
@ -449,7 +449,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
   SetShowIcon(
       ::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
 
-@@ -1015,8 +1029,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
+@@ -1014,8 +1028,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
   contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
       devtools_web_view_, contents_web_view_, watermark_view_));
 
@ -467,7 +467,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
 
   contents_separator_ =
       top_container_->AddChildView(std::make_unique<ContentsSeparator>());
-@@ -1096,7 +1117,9 @@ void BrowserView::ToggleCompactModeUI() {
+@@ -1095,7 +1116,9 @@ void BrowserView::ToggleCompactModeUI() {
 }
 
 BrowserView::~BrowserView() {
@ -477,7 +477,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
 
   // Destroy the top controls slide controller first as it depends on the
   // tabstrip model and the browser frame.
-@@ -1104,7 +1127,9 @@ BrowserView::~BrowserView() {
+@@ -1103,7 +1126,9 @@ BrowserView::~BrowserView() {
 
   // All the tabs should have been destroyed already. If we were closed by the
   // OS with some tabs than the NativeBrowserFrame should have destroyed them.
@ -487,7 +487,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
 
   // Stop the animation timer explicitly here to avoid running it in a nested
   // message loop, which may run by Browser destructor.
-@@ -1113,17 +1138,18 @@ BrowserView::~BrowserView() {
+@@ -1112,17 +1137,18 @@ BrowserView::~BrowserView() {
   // Immersive mode may need to reparent views before they are removed/deleted.
   immersive_mode_controller_.reset();
 
@ -510,7 +510,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
 
   // These are raw pointers to child views, so they need to be set to null
   // before `RemoveAllChildViews()` is called to avoid dangling.
-@@ -1704,6 +1730,13 @@ gfx::Point BrowserView::GetThemeOffsetFromBrowserView() const {
+@@ -1703,6 +1729,16 @@ gfx::Point BrowserView::GetThemeOffsetFromBrowserView() const {
       ThemeProperties::kFrameHeightAboveTabs - browser_view_origin.y());
 }
 
@ -519,12 +519,15 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
 +  // since it is responsible for showing autofill related bubbles from toolbar's
 +  // child views and it is an observer for avatar toolbar button if any.
 +  autofill_bubble_handler_.reset();
+
+  toolbar_ = nullptr;
+  toolbar_button_provider_ = nullptr;
 +}
 +
 // static:
 BrowserView::DevToolsDockedPlacement BrowserView::GetDevToolsDockedPlacement(
     const gfx::Rect& contents_webview_bounds,
-@@ -2118,9 +2151,14 @@ void BrowserView::OnExclusiveAccessUserInput() {
+@@ -2118,9 +2154,14 @@ void BrowserView::OnExclusiveAccessUserInput() {
 
 bool BrowserView::ShouldHideUIForFullscreen() const {
   // Immersive mode needs UI for the slide-down top panel.
@ -540,7 +543,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
   return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
 }
 
-@@ -3308,7 +3346,8 @@ views::View* BrowserView::GetTopContainer() {
+@@ -3308,7 +3349,8 @@ views::View* BrowserView::GetTopContainer() {
 }
 
 DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() {
@ -550,7 +553,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
   if (auto* download_button = toolbar_button_provider_->GetDownloadButton())
     return download_button->bubble_controller();
   return nullptr;
-@@ -3876,7 +3915,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
+@@ -3890,7 +3932,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
   if (top_container()->parent() == this)
     return;
 
@ -560,7 +563,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
   top_container()->DestroyLayer();
   AddChildViewAt(top_container(), 0);
   EnsureFocusOrder();
-@@ -4366,11 +4406,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) {
+@@ -4381,11 +4424,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) {
 bool BrowserView::ShouldDescendIntoChildForEventHandling(
     gfx::NativeView child,
     const gfx::Point& location) {
@ -601,7 +604,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
     // Draggable regions are defined relative to the web contents.
     gfx::Point point_in_contents_web_view_coords(location);
     views::View::ConvertPointToTarget(GetWidget()->GetRootView(),
-@@ -4379,7 +4446,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling(
+@@ -4394,7 +4464,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling(
 
     // Draggable regions should be ignored for clicks into any browser view's
     // owned widgets, for example alerts, permission prompts or find bar.
@ -610,7 +613,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
                point_in_contents_web_view_coords.x(),
                point_in_contents_web_view_coords.y()) ||
            WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords);
-@@ -4490,8 +4557,10 @@ void BrowserView::Layout(PassKey) {
+@@ -4505,8 +4575,10 @@ void BrowserView::Layout(PassKey) {
 
   // TODO(jamescook): Why was this in the middle of layout code?
   toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -623,7 +626,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
 
   // Some of the situations when the BrowserView is laid out are:
   // - Enter/exit immersive fullscreen mode.
-@@ -4557,6 +4626,11 @@ void BrowserView::AddedToWidget() {
+@@ -4572,6 +4644,11 @@ void BrowserView::AddedToWidget() {
   SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
 #endif
 
@ -635,7 +638,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
   toolbar_->Init();
 
   // TODO(pbos): Investigate whether the side panels should be creatable when
-@@ -4599,13 +4673,9 @@ void BrowserView::AddedToWidget() {
+@@ -4614,13 +4691,9 @@ void BrowserView::AddedToWidget() {
 
   EnsureFocusOrder();
 
@ -651,7 +654,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
   using_native_frame_ = frame_->ShouldUseNativeFrame();
 
   MaybeInitializeWebUITabStrip();
-@@ -4967,7 +5037,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, const int64_t display_id) {
+@@ -5006,7 +5079,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, const int64_t display_id) {
   // Undo our anti-jankiness hacks and force a re-layout.
   in_process_fullscreen_ = false;
   ToolbarSizeChanged(false);
@ -661,7 +664,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
 }
 
 void BrowserView::RequestFullscreen(bool fullscreen, int64_t display_id) {
-@@ -5468,6 +5539,8 @@ Profile* BrowserView::GetProfile() {
+@@ -5512,6 +5586,8 @@ Profile* BrowserView::GetProfile() {
 }
 
 void BrowserView::UpdateUIForTabFullscreen() {
@ -670,7 +673,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
   frame()->GetFrameView()->UpdateFullscreenTopUI();
 }
 
-@@ -5490,6 +5563,8 @@ void BrowserView::HideDownloadShelf() {
+@@ -5534,6 +5610,8 @@ void BrowserView::HideDownloadShelf() {
 }
 
 bool BrowserView::CanUserExitFullscreen() const {
@ -680,7 +683,7 @@ index 3b1fa8ba79fcb..77e681c8cbdc0 100644
 }
 
 diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
-index 6422f5dfe3e31..4412e63d411c1 100644
+index bdb273f5134b8..2750336aca016 100644
 --- chrome/browser/ui/views/frame/browser_view.h
 +++ chrome/browser/ui/views/frame/browser_view.h
@@ -139,11 +139,16 @@ class BrowserView : public BrowserWindow,
@ -700,7 +703,7 @@ index 6422f5dfe3e31..4412e63d411c1 100644
   void set_frame(BrowserFrame* frame) {
     frame_ = frame;
     paint_as_active_subscription_ =
-@@ -838,6 +843,10 @@ class BrowserView : public BrowserWindow,
+@@ -841,6 +846,10 @@ class BrowserView : public BrowserWindow,
   void Copy();
   void Paste();
 
@ -711,7 +714,7 @@ index 6422f5dfe3e31..4412e63d411c1 100644
  protected:
   // Enumerates where the devtools are docked relative to the browser's main
   // web contents.
-@@ -861,6 +870,8 @@ class BrowserView : public BrowserWindow,
+@@ -864,6 +873,8 @@ class BrowserView : public BrowserWindow,
       const gfx::Rect& contents_webview_bounds,
       const gfx::Rect& local_webview_container_bounds);
 
@ -1003,10 +1006,10 @@ index a80a496c99a26..7cb24bf8505de 100644
 }
 
 diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
-index 49a6e89aa17f0..e7ab5815890b8 100644
+index 1b494d20b6342..c3eb67da3c3ba 100644
 --- chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -194,7 +194,7 @@ class TabstripLikeBackground : public views::Background {
+@@ -193,7 +193,7 @@ class TabstripLikeBackground : public views::Background {
   void Paint(gfx::Canvas* canvas, views::View* view) const override {
     bool painted = TopContainerBackground::PaintThemeCustomImage(canvas, view,
                                                                  browser_view_);
@ -1015,7 +1018,7 @@ index 49a6e89aa17f0..e7ab5815890b8 100644
       SkColor frame_color =
           browser_view_->frame()->GetFrameView()->GetFrameColor(
               BrowserFrameActiveState::kUseCurrent);
-@@ -225,12 +225,13 @@ END_METADATA
+@@ -224,12 +224,13 @@ END_METADATA
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
 
@ -1031,7 +1034,7 @@ index 49a6e89aa17f0..e7ab5815890b8 100644
   SetID(VIEW_ID_TOOLBAR);
 
   container_view_ = AddChildView(std::make_unique<ContainerView>());
-@@ -259,9 +260,24 @@ ToolbarView::~ToolbarView() {
+@@ -258,9 +259,24 @@ ToolbarView::~ToolbarView() {
 
   for (const auto& view_and_command : GetViewCommandMap())
     chrome::RemoveCommandObserver(browser_, view_and_command.second, this);
@ -1056,7 +1059,7 @@ index 49a6e89aa17f0..e7ab5815890b8 100644
 #if defined(USE_AURA)
   // Avoid generating too many occlusion tracking calculation events before this
   // function returns. The occlusion status will be computed only once once this
-@@ -284,12 +300,12 @@ void ToolbarView::Init() {
+@@ -283,12 +299,12 @@ void ToolbarView::Init() {
 
   auto location_bar = std::make_unique<LocationBarView>(
       browser_, browser_->profile(), browser_->command_controller(), this,
@ -1072,9 +1075,9 @@ index 49a6e89aa17f0..e7ab5815890b8 100644
         std::make_unique<DownloadToolbarButtonView>(browser_view_);
   }
@@ -370,7 +386,8 @@ void ToolbarView::Init() {
-   }
   std::unique_ptr<media_router::CastToolbarButton> cast;
-   if (!features::IsToolbarPinningEnabled()) {
+   if (!(features::IsToolbarPinningEnabled() &&
+       base::FeatureList::IsEnabled(features::kPinnedCastButton))) {
 -    if (media_router::MediaRouterEnabled(browser_->profile())) {
 +    if (media_router::MediaRouterEnabled(browser_->profile()) &&
 +        BUTTON_VISIBLE(kCast)) {
@ -1091,7 +1094,7 @@ index 49a6e89aa17f0..e7ab5815890b8 100644
     send_tab_to_self_button =
         std::make_unique<send_tab_to_self::SendTabToSelfToolbarIconView>(
             browser_view_);
-@@ -844,7 +862,8 @@ void ToolbarView::Layout(PassKey) {
+@@ -845,7 +863,8 @@ void ToolbarView::Layout(PassKey) {
 
   if (display_mode_ == DisplayMode::NORMAL) {
     LayoutCommon();
--- a/patch/patches/content_2015.patch
+++ b/patch/patches/content_2015.patch
@ -12,7 +12,7 @@ index 11c9cd82d0392..9c700bc625cd5 100644
     version.Set("V8-Version", V8_VERSION_STRING);
     std::string host = info.GetHeaderValue("host");
 diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
-index 736d8ae6db4a3..372d6cb9eef7f 100644
+index ebfa887660e23..6a8958000fb64 100644
 --- content/browser/loader/navigation_url_loader_impl.cc
 +++ content/browser/loader/navigation_url_loader_impl.cc
@@ -863,7 +863,7 @@ NavigationURLLoaderImpl::CreateNonNetworkLoaderFactory(
@ -47,7 +47,7 @@ index 736d8ae6db4a3..372d6cb9eef7f 100644
     return std::make_pair(
         /*is_cacheable=*/false,
 diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
-index a55557845dd85..ddbf8ce90227d 100644
+index 21967547790ca..7bdf48b830a21 100644
 --- content/public/browser/content_browser_client.cc
 +++ content/public/browser/content_browser_client.cc
@@ -1138,7 +1138,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
@ -68,7 +68,7 @@ index a55557845dd85..ddbf8ce90227d 100644
 
 std::vector<base::FilePath>
 diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
-index 57f1179aad3c7..ad218cfa315d4 100644
+index 0f6781dc459e1..8d8deaba4e049 100644
 --- content/public/browser/content_browser_client.h
 +++ content/public/browser/content_browser_client.h
@@ -2188,7 +2188,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@ -80,7 +80,7 @@ index 57f1179aad3c7..ad218cfa315d4 100644
       BrowserContext* context,
       bool in_memory,
       const base::FilePath& relative_partition_path,
-@@ -2409,6 +2409,22 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -2412,6 +2412,22 @@ class CONTENT_EXPORT ContentBrowserClient {
       const net::IsolationInfo& isolation_info,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
 
@ -103,7 +103,7 @@ index 57f1179aad3c7..ad218cfa315d4 100644
   // Creates an OverlayWindow to be used for video or Picture-in-Picture.
   // This window will house the content shown when in Picture-in-Picture mode.
   // This will return a new OverlayWindow.
-@@ -2469,6 +2485,10 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -2472,6 +2488,10 @@ class CONTENT_EXPORT ContentBrowserClient {
   // Used as part of the user agent string.
   virtual std::string GetProduct();
 
@ -140,7 +140,7 @@ index 784e0a5166d6b..1fd1e9ee107f3 100644
   // started.
   virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
 diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
-index 1a13fc3eb3362..aa1f92cbf728e 100644
+index 15e28effa2cbf..eb25a1adb7f6c 100644
 --- content/renderer/render_thread_impl.cc
 +++ content/renderer/render_thread_impl.cc
@@ -568,6 +568,8 @@ void RenderThreadImpl::Init() {
@ -187,10 +187,10 @@ index 69c52cb8333fc..ac2bbc7459864 100644
   // plus eTLD+1, such as https://google.com), or to a more specific origin.
   void SetIsLockedToSite();
 diff --git content/shell/browser/shell_content_browser_client.cc content/shell/browser/shell_content_browser_client.cc
-index 552345eecf589..996dd96388372 100644
+index 6c08727a74408..2efb3de40164d 100644
 --- content/shell/browser/shell_content_browser_client.cc
 +++ content/shell/browser/shell_content_browser_client.cc
-@@ -756,7 +756,7 @@ void ShellContentBrowserClient::OnNetworkServiceCreated(
+@@ -757,7 +757,7 @@ void ShellContentBrowserClient::OnNetworkServiceCreated(
 #endif
 }
 
@ -199,7 +199,7 @@ index 552345eecf589..996dd96388372 100644
     BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
-@@ -765,6 +765,7 @@ void ShellContentBrowserClient::ConfigureNetworkContextParams(
+@@ -766,6 +766,7 @@ void ShellContentBrowserClient::ConfigureNetworkContextParams(
         cert_verifier_creation_params) {
   ConfigureNetworkContextParamsForShell(context, network_context_params,
                                         cert_verifier_creation_params);
@ -208,7 +208,7 @@ index 552345eecf589..996dd96388372 100644
 
 std::vector<base::FilePath>
 diff --git content/shell/browser/shell_content_browser_client.h content/shell/browser/shell_content_browser_client.h
-index c6784075ed657..ebba4477dfa65 100644
+index a2514c8a9f8a8..3266b8a0bd781 100644
 --- content/shell/browser/shell_content_browser_client.h
 +++ content/shell/browser/shell_content_browser_client.h
@@ -150,7 +150,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {
--- a/patch/patches/gn_config.patch
+++ b/patch/patches/gn_config.patch
@ -12,7 +12,7 @@ index 44a11ec90ec9b..4c35b35a97f28 100644
       # https://crbug.com/474506.
       "//clank/java/BUILD.gn",
 diff --git BUILD.gn BUILD.gn
-index 7c46b25626512..1a438687b67e6 100644
+index 3d8fa4d09b729..381172ec653f4 100644
 --- BUILD.gn
 +++ BUILD.gn
@@ -20,6 +20,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@ -76,7 +76,7 @@ index 1da479dd5eebc..ff9c7e467997c 100644
 -  visual_studio_runtime_dirs = []
 }
 diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
-index 17491efcceeee..5d54a58fb9651 100644
+index 4f99bf3e0ee60..d4b3f46070697 100644
 --- chrome/chrome_paks.gni
 +++ chrome/chrome_paks.gni
@@ -6,6 +6,7 @@ import("//ash/ambient/resources/resources.gni")
@ -87,7 +87,7 @@ index 17491efcceeee..5d54a58fb9651 100644
 import("//chrome/browser/buildflags.gni")
 import("//chrome/common/features.gni")
 import("//components/compose/features.gni")
-@@ -470,6 +471,10 @@ template("chrome_extra_paks") {
+@@ -473,6 +474,10 @@ template("chrome_extra_paks") {
       ]
       deps += [ "//extensions:extensions_resources" ]
     }
@ -99,7 +99,7 @@ index 17491efcceeee..5d54a58fb9651 100644
       sources += [ "$root_gen_dir/chrome/extensions_resources.pak" ]
       deps += [ "//chrome/browser/resources/extensions:resources" ]
 diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni
-index 736d258d04b95..b496c0d3a0e4e 100644
+index 0ec0aa2c8efb3..be510257b243c 100644
 --- chrome/chrome_repack_locales.gni
 +++ chrome/chrome_repack_locales.gni
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
@ -110,7 +110,7 @@ index 736d258d04b95..b496c0d3a0e4e 100644
 import("//extensions/buildflags/buildflags.gni")
 import("//tools/grit/repack.gni")
 
-@@ -107,6 +108,10 @@ template("chrome_repack_locales") {
+@@ -109,6 +110,10 @@ template("chrome_repack_locales") {
       source_patterns += [ "${root_gen_dir}/components/strings/search_engine_descriptions_strings_" ]
       deps += [ "//components/strings:search_engine_descriptions_strings" ]
     }
@ -122,7 +122,7 @@ index 736d258d04b95..b496c0d3a0e4e 100644
       source_patterns +=
           [ "${root_gen_dir}/extensions/strings/extensions_strings_" ]
 diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
-index 52905752585a9..a6af98ca658c5 100644
+index c490d199bf51e..4c0de0d7a0822 100644
 --- chrome/installer/mini_installer/BUILD.gn
 +++ chrome/installer/mini_installer/BUILD.gn
@@ -7,6 +7,7 @@ import("//build/config/features.gni")
--- a/patch/patches/gritsettings.patch
+++ b/patch/patches/gritsettings.patch
@ -1,8 +1,8 @@
 diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
-index 19809ccc43fae..bd5cb44b8ffc1 100644
+index 38cf9d8fd803f..f7fe30053dfca 100644
 --- tools/gritsettings/resource_ids.spec
 +++ tools/gritsettings/resource_ids.spec
-@@ -1368,6 +1368,15 @@
+@@ -1376,6 +1376,15 @@
   # END "everything else" section.
   # Everything but chrome/, components/, content/, and ios/
 
--- a/patch/patches/mac_platform_style_bubble_893292.patch
+++ b/patch/patches/mac_platform_style_bubble_893292.patch
@ -1,8 +1,8 @@
 diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-index e4187c12a2d62..458be6c7fc9a8 100644
+index 6cc1e99acab04..a1d8b7caf1e2c 100644
 --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
 +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -1234,8 +1234,8 @@ int ProfileMenuViewBase::GetMaxHeight() const {
+@@ -1237,8 +1237,8 @@ int ProfileMenuViewBase::GetMaxHeight() const {
           ->GetDisplayNearestPoint(anchor_rect.CenterPoint())
           .work_area();
   int available_space = screen_space.bottom() - anchor_rect.bottom();
--- a/patch/patches/net_cookie_flags.patch
+++ b/patch/patches/net_cookie_flags.patch
@ -10,7 +10,7 @@ index aeb79b46f5d21..bd57e874c1240 100644
 +// This load will not send any cookies. For CEF usage.
 +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 20)
 diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
-index 40c76f66d1500..29479608ba320 100644
+index b1ffe26b43448..99266abd58e01 100644
 --- net/url_request/url_request_http_job.cc
 +++ net/url_request/url_request_http_job.cc
@@ -2079,7 +2079,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
--- a/patch/patches/net_url_request_3596.patch
+++ b/patch/patches/net_url_request_3596.patch
@ -1,16 +1,16 @@
 diff --git net/url_request/url_request_job.cc net/url_request/url_request_job.cc
-index 10f3c6ca826bf..a1ce407076619 100644
+index dc0381e682e2a..16f6666efdcda 100644
 --- net/url_request/url_request_job.cc
 +++ net/url_request/url_request_job.cc
-@@ -35,6 +35,7 @@
- #include "net/ssl/ssl_private_key.h"
+@@ -36,6 +36,7 @@
+ #include "net/url_request/redirect_info.h"
 #include "net/url_request/redirect_util.h"
 #include "net/url_request/url_request_context.h"
 +#include "url/url_util.h"
 
 namespace net {
 
-@@ -47,6 +48,16 @@ base::Value::Dict SourceStreamSetParams(SourceStream* source_stream) {
+@@ -48,6 +49,16 @@ base::Value::Dict SourceStreamSetParams(SourceStream* source_stream) {
   return event_params;
 }
 
@ -27,7 +27,7 @@ index 10f3c6ca826bf..a1ce407076619 100644
 }  // namespace
 
 // Each SourceStreams own the previous SourceStream in the chain, but the
-@@ -338,8 +349,7 @@ GURL URLRequestJob::ComputeReferrerForPolicy(
+@@ -326,8 +337,7 @@ GURL URLRequestJob::ComputeReferrerForPolicy(
   }
 
   bool secure_referrer_but_insecure_destination =
--- a/patch/patches/osr_fling_2745.patch
+++ b/patch/patches/osr_fling_2745.patch
@ -30,10 +30,10 @@ index 76057b3e50f78..d3b63a3b07805 100644
 
 }  // namespace input
 diff --git components/input/render_input_router.h components/input/render_input_router.h
-index 82f462173913b..05b4824ec8329 100644
+index d5c125e621004..cd1177744e1a8 100644
 --- components/input/render_input_router.h
 +++ components/input/render_input_router.h
-@@ -66,6 +66,7 @@ class COMPONENT_EXPORT(INPUT) RenderInputRouter
+@@ -67,6 +67,7 @@ class COMPONENT_EXPORT(INPUT) RenderInputRouter
 
   InputRouter* input_router() { return input_router_.get(); }
   RenderInputRouterDelegate* delegate() { return delegate_; }
--- a/patch/patches/rfh_navigation_4829483.patch
+++ b/patch/patches/rfh_navigation_4829483.patch
@ -1,5 +1,5 @@
 diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
-index 20ed48220d230..a8774d167bcad 100644
+index 98c865765c57d..7694cd4516dc9 100644
 --- content/browser/renderer_host/render_frame_host_impl.cc
 +++ content/browser/renderer_host/render_frame_host_impl.cc
@@ -11466,6 +11466,7 @@ void RenderFrameHostImpl::CommitNavigation(
--- a/patch/patches/services_network_2718.patch
+++ b/patch/patches/services_network_2718.patch
@ -1,8 +1,8 @@
 diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
-index 8e5c22a3050d9..dd000e024d95d 100644
+index a45a20da28026..6ab41c52f0b54 100644
 --- content/browser/storage_partition_impl.cc
 +++ content/browser/storage_partition_impl.cc
-@@ -3334,9 +3334,12 @@ void StoragePartitionImpl::InitNetworkContext() {
+@@ -3336,9 +3336,12 @@ void StoragePartitionImpl::InitNetworkContext() {
   cert_verifier::mojom::CertVerifierCreationParamsPtr
       cert_verifier_creation_params =
           cert_verifier::mojom::CertVerifierCreationParams::New();
--- a/patch/patches/trace_event.patch
+++ b/patch/patches/trace_event.patch
@ -1,5 +1,5 @@
 diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
-index 5ba3046b83e88..66e1364a3110a 100644
+index bf7628ed92355..a0911d52890b9 100644
 --- base/trace_event/builtin_categories.h
 +++ base/trace_event/builtin_categories.h
@@ -71,6 +71,8 @@
--- a/patch/patches/ui_dragdrop_355390.patch
+++ b/patch/patches/ui_dragdrop_355390.patch
@ -1,8 +1,8 @@
 diff --git ui/base/x/x11_os_exchange_data_provider.cc ui/base/x/x11_os_exchange_data_provider.cc
-index 01a3c3c038986..3fc2154ca49a4 100644
+index 8a9a5b6bc8bf9..f10bcd36c11d9 100644
 --- ui/base/x/x11_os_exchange_data_provider.cc
 +++ ui/base/x/x11_os_exchange_data_provider.cc
-@@ -169,7 +169,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,
+@@ -168,7 +168,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,
     format_map_.Insert(x11::GetAtom(kMimeTypeMozillaURL), mem);
 
     // Set a string fallback as well.
--- a/patch/patches/views_1749_2102_3330.patch
+++ b/patch/patches/views_1749_2102_3330.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/ui/views/toolbar/app_menu.cc chrome/browser/ui/views/toolbar/app_menu.cc
-index d7e3313414e5b..8691f6e1a4131 100644
+index 7d91e43c61417..8956ad4452b57 100644
 --- chrome/browser/ui/views/toolbar/app_menu.cc
 +++ chrome/browser/ui/views/toolbar/app_menu.cc
@@ -1014,7 +1014,9 @@ void AppMenu::RunMenu(views::MenuButtonController* host) {
@ -164,10 +164,10 @@ index 7586a6f089f62..4e3a40b33f535 100644
   LabelButtonImageContainer* image_container() {
     return image_container_.get();
 diff --git ui/views/controls/label.cc ui/views/controls/label.cc
-index cd330fd0a56e1..f2a54c5c47068 100644
+index accbbb51263ba..7ba1eb32f1bb3 100644
 --- ui/views/controls/label.cc
 +++ ui/views/controls/label.cc
-@@ -51,12 +51,29 @@ enum LabelPropertyKey {
+@@ -52,12 +52,29 @@ enum LabelPropertyKey {
   kLabelLineHeight,
   kLabelObscured,
   kLabelAllowCharacterBreak,
@ -197,7 +197,7 @@ index cd330fd0a56e1..f2a54c5c47068 100644
 }  // namespace
 
 namespace views {
-@@ -496,6 +513,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
+@@ -497,6 +514,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
   OnPropertyChanged(&elide_behavior_, kPropertyEffectsPreferredSizeChanged);
 }
 
@ -213,7 +213,7 @@ index cd330fd0a56e1..f2a54c5c47068 100644
 std::u16string Label::GetTooltipText() const {
   return tooltip_text_;
 }
-@@ -815,6 +841,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
+@@ -816,6 +842,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
       render_text->SelectRange(stored_selection_range_);
   }
 
@ -231,10 +231,10 @@ index cd330fd0a56e1..f2a54c5c47068 100644
 }
 
 diff --git ui/views/controls/label.h ui/views/controls/label.h
-index bc315ed47b197..2c0f4deafb3c1 100644
+index aae9bfa72f8f9..386cdead499f7 100644
 --- ui/views/controls/label.h
 +++ ui/views/controls/label.h
-@@ -245,6 +245,10 @@ class VIEWS_EXPORT Label : public View,
+@@ -246,6 +246,10 @@ class VIEWS_EXPORT Label : public View,
   gfx::ElideBehavior GetElideBehavior() const;
   void SetElideBehavior(gfx::ElideBehavior elide_behavior);
 
@ -245,7 +245,7 @@ index bc315ed47b197..2c0f4deafb3c1 100644
   // Gets/Sets the tooltip text.  Default behavior for a label (single-line) is
   // to show the full text if it is wider than its bounds.  Calling this
   // overrides the default behavior and lets you set a custom tooltip.  To
-@@ -530,6 +534,7 @@ class VIEWS_EXPORT Label : public View,
+@@ -532,6 +536,7 @@ class VIEWS_EXPORT Label : public View,
   int max_width_ = 0;
   // This is used in single-line mode.
   int max_width_single_line_ = 0;
@ -254,10 +254,10 @@ index bc315ed47b197..2c0f4deafb3c1 100644
   std::unique_ptr<SelectionController> selection_controller_;
 
 diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
-index c394177f4a19b..fd88fa8a89d91 100644
+index bbbc64c5f4644..516aaa1468d17 100644
 --- ui/views/controls/menu/menu_controller.cc
 +++ ui/views/controls/menu/menu_controller.cc
-@@ -578,7 +578,8 @@ void MenuController::Run(Widget* parent,
+@@ -579,7 +579,8 @@ void MenuController::Run(Widget* parent,
                          MenuAnchorPosition position,
                          bool context_menu,
                          bool is_nested_drag,
@ -267,7 +267,7 @@ index c394177f4a19b..fd88fa8a89d91 100644
   exit_type_ = ExitType::kNone;
   possible_drag_ = false;
   drag_in_progress_ = false;
-@@ -623,6 +624,7 @@ void MenuController::Run(Widget* parent,
+@@ -624,6 +625,7 @@ void MenuController::Run(Widget* parent,
       owner_->AddObserver(this);
 
     native_view_for_gestures_ = native_view_for_gestures;
@ -275,7 +275,7 @@ index c394177f4a19b..fd88fa8a89d91 100644
 
     // Only create a MenuPreTargetHandler for non-nested menus. Nested menus
     // will use the existing one.
-@@ -2263,6 +2265,7 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
+@@ -2264,6 +2266,7 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
     params.do_capture = do_capture;
     params.native_view_for_gestures = native_view_for_gestures_;
     params.owned_window_anchor = anchor;
@ -283,7 +283,7 @@ index c394177f4a19b..fd88fa8a89d91 100644
     if (item->GetParentMenuItem()) {
       params.context = item->GetWidget();
       // (crbug.com/1414232) The item to be open is a submenu. Make sure
-@@ -2940,8 +2943,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
+@@ -2941,8 +2944,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
 
 void MenuController::OpenSubmenuChangeSelectionIfCan() {
   MenuItemView* item = pending_state_.item;
@ -298,7 +298,7 @@ index c394177f4a19b..fd88fa8a89d91 100644
 
   // Show the sub-menu.
   SetSelection(item, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
-@@ -2961,8 +2969,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
+@@ -2962,8 +2970,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
 void MenuController::CloseSubmenu() {
   MenuItemView* item = state_.item;
   DCHECK(item);
@ -311,10 +311,10 @@ index c394177f4a19b..fd88fa8a89d91 100644
     SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
   else if (item->GetParentMenuItem()->GetParentMenuItem())
 diff --git ui/views/controls/menu/menu_controller.h ui/views/controls/menu/menu_controller.h
-index e1c59fd911f71..d2a72f6bdf8aa 100644
+index e516d8035db49..2209823333fd7 100644
 --- ui/views/controls/menu/menu_controller.h
 +++ ui/views/controls/menu/menu_controller.h
-@@ -137,7 +137,9 @@ class VIEWS_EXPORT MenuController final : public gfx::AnimationDelegate,
+@@ -138,7 +138,9 @@ class VIEWS_EXPORT MenuController final : public gfx::AnimationDelegate,
            MenuAnchorPosition position,
            bool context_menu,
            bool is_nested_drag,
@ -325,7 +325,7 @@ index e1c59fd911f71..d2a72f6bdf8aa 100644
 
   bool for_drop() const { return for_drop_; }
 
-@@ -741,6 +743,8 @@ class VIEWS_EXPORT MenuController final : public gfx::AnimationDelegate,
+@@ -742,6 +744,8 @@ class VIEWS_EXPORT MenuController final : public gfx::AnimationDelegate,
   // RunType::SEND_GESTURE_EVENTS_TO_OWNER is set.
   gfx::NativeView native_view_for_gestures_ = gfx::NativeView();
 
@ -335,7 +335,7 @@ index e1c59fd911f71..d2a72f6bdf8aa 100644
   bool possible_drag_ = false;
 
 diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
-index 7c6ff7acb08a7..91ababb3dccd8 100644
+index ec079fa83c063..d644ab72fed07 100644
 --- ui/views/controls/menu/menu_delegate.h
 +++ ui/views/controls/menu/menu_delegate.h
@@ -73,6 +73,22 @@ class VIEWS_EXPORT MenuDelegate {
@ -553,18 +553,18 @@ index d2e0377559862..de2b0e2d2fa28 100644
   void WillHideMenu(MenuItemView* menu) override;
   void OnMenuClosed(MenuItemView* menu) override;
 diff --git ui/views/controls/menu/menu_runner.cc ui/views/controls/menu/menu_runner.cc
-index 9f746392f6d83..fa37345b6e021 100644
+index 720cd4aed05c1..2cb6f982ae8d6 100644
 --- ui/views/controls/menu/menu_runner.cc
 +++ ui/views/controls/menu/menu_runner.cc
-@@ -42,6 +42,7 @@ void MenuRunner::RunMenuAt(
+@@ -43,6 +43,7 @@ void MenuRunner::RunMenuAt(
     MenuAnchorPosition anchor,
-     ui::MenuSourceType source_type,
+     ui::mojom::MenuSourceType source_type,
     gfx::NativeView native_view_for_gestures,
 +    gfx::AcceleratedWidget parent_widget,
     std::optional<gfx::RoundedCornersF> corners,
     std::optional<std::string> show_menu_host_duration_histogram) {
   // Do not attempt to show the menu if the application is currently shutting
-@@ -89,7 +90,7 @@ void MenuRunner::RunMenuAt(
+@@ -90,7 +91,7 @@ void MenuRunner::RunMenuAt(
   }
 
   impl_->RunMenuAt(parent, button_controller, bounds, anchor, run_types_,
@ -574,12 +574,12 @@ index 9f746392f6d83..fa37345b6e021 100644
 }
 
 diff --git ui/views/controls/menu/menu_runner.h ui/views/controls/menu/menu_runner.h
-index c18d1c4d729e1..a73c48c02f1be 100644
+index fa8028a7a6d20..dc6d1210462a4 100644
 --- ui/views/controls/menu/menu_runner.h
 +++ ui/views/controls/menu/menu_runner.h
@@ -157,6 +157,8 @@ class VIEWS_EXPORT MenuRunner {
                  MenuAnchorPosition anchor,
-                  ui::MenuSourceType source_type,
+                  ui::mojom::MenuSourceType source_type,
                  gfx::NativeView native_view_for_gestures = gfx::NativeView(),
 +                 gfx::AcceleratedWidget parent_widget =
 +                     gfx::kNullAcceleratedWidget,
@ -785,7 +785,7 @@ index dcf4b60ad92c2..64fa80edefc1b 100644
 #if !BUILDFLAG(IS_CHROMEOS_LACROS)
   if (root_location != root_current_location &&
 diff --git ui/views/view.h ui/views/view.h
-index 4ce922b20a9d1..2505558b6428c 100644
+index 14d175dacf2ae..7a7c051f6ee08 100644
 --- ui/views/view.h
 +++ ui/views/view.h
@@ -25,6 +25,7 @@
@ -796,7 +796,7 @@ index 4ce922b20a9d1..2505558b6428c 100644
 #include "base/types/pass_key.h"
 #include "build/build_config.h"
 #include "third_party/skia/include/core/SkPath.h"
-@@ -289,7 +290,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
+@@ -290,7 +291,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
                           public ui::EventTarget,
                           public ui::EventHandler,
                           public ui::PropertyHandler,
@ -806,7 +806,7 @@ index 4ce922b20a9d1..2505558b6428c 100644
   // Do not remove this macro!
   // The macro is maintained by the memory safety team.
   ADVANCED_MEMORY_SAFETY_CHECKS();
-@@ -609,7 +611,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
+@@ -610,7 +612,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
 
   // Return the preferred height for a specific width. It is a helper function
   // of GetPreferredSize(SizeBounds(w, SizeBound())).height().
--- a/patch/patches/views_textfield_5399416.patch
+++ b/patch/patches/views_textfield_5399416.patch
@ -1,8 +1,8 @@
 diff --git ui/views/controls/textfield/textfield.cc ui/views/controls/textfield/textfield.cc
-index 4f90ed932bb64..b8abe99e7d07b 100644
+index 931fd32050882..06f009728d812 100644
 --- ui/views/controls/textfield/textfield.cc
 +++ ui/views/controls/textfield/textfield.cc
-@@ -3015,6 +3015,10 @@ void Textfield::OnCursorBlinkTimerFired() {
+@@ -3017,6 +3017,10 @@ void Textfield::OnCursorBlinkTimerFired() {
 void Textfield::OnEnabledChanged() {
   if (GetInputMethod())
     GetInputMethod()->OnTextInputTypeChanged(this);
--- a/patch/patches/views_widget.patch
+++ b/patch/patches/views_widget.patch
@ -1,5 +1,5 @@
 diff --git chrome/browser/extensions/api/sessions/sessions_api.cc chrome/browser/extensions/api/sessions/sessions_api.cc
-index ac74d193287c9..c165d516d64be 100644
+index 747d429ae99a5..c8dd80409068b 100644
 --- chrome/browser/extensions/api/sessions/sessions_api.cc
 +++ chrome/browser/extensions/api/sessions/sessions_api.cc
@@ -341,6 +341,7 @@ SessionsGetDevicesFunction::CreateWindowModel(
@ -273,10 +273,10 @@ index e31c5b4cb6726..1b724948c2868 100644
   return host ? host->GetAcceleratedWidget() : nullptr;
 }
 diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
-index 684eab466f51f..88ec59d97d926 100644
+index feffe48a5695d..69a544dba8fb1 100644
 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
-@@ -195,6 +195,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
+@@ -193,6 +193,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
   return result;
 }
 
@ -295,7 +295,7 @@ index 684eab466f51f..88ec59d97d926 100644
 void DesktopWindowTreeHostLinux::DispatchEvent(ui::Event* event) {
   // In Windows, the native events sent to chrome are separated into client
   // and non-client versions of events, which we record on our LocatedEvent
-@@ -330,6 +342,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
+@@ -328,6 +340,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
 
   properties->wayland_app_id = params.wayland_app_id;
 
--- a/patch/patches/web_contents_1257_1565.patch
+++ b/patch/patches/web_contents_1257_1565.patch
@ -1,8 +1,8 @@
 diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
-index 0e62bcaf1c171..2d6bde17f774c 100644
+index f25b2cc6c138a..75d0f1d479668 100644
 --- content/browser/web_contents/web_contents_impl.cc
 +++ content/browser/web_contents/web_contents_impl.cc
-@@ -3650,6 +3650,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3651,6 +3651,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
       params.main_frame_name, GetOpener(), primary_main_frame_policy,
       base::UnguessableToken::Create());
 
@ -15,7 +15,7 @@ index 0e62bcaf1c171..2d6bde17f774c 100644
   std::unique_ptr<WebContentsViewDelegate> delegate =
       GetContentClient()->browser()->GetWebContentsViewDelegate(this);
 
-@@ -3660,6 +3666,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3661,6 +3667,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
     view_ = CreateWebContentsView(this, std::move(delegate),
                                   &render_view_host_delegate_view_);
   }
@ -23,7 +23,7 @@ index 0e62bcaf1c171..2d6bde17f774c 100644
   CHECK(render_view_host_delegate_view_);
   CHECK(view_.get());
 
-@@ -3857,6 +3864,9 @@ void WebContentsImpl::RenderWidgetCreated(
+@@ -3858,6 +3865,9 @@ void WebContentsImpl::RenderWidgetCreated(
   OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
                         "render_widget_host", render_widget_host);
   created_widgets_.insert(render_widget_host);
@ -33,7 +33,7 @@ index 0e62bcaf1c171..2d6bde17f774c 100644
 }
 
 void WebContentsImpl::RenderWidgetDeleted(
-@@ -4740,6 +4750,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4741,6 +4751,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
     create_params.picture_in_picture_options = *(params.pip_options);
   }
 
@ -49,7 +49,7 @@ index 0e62bcaf1c171..2d6bde17f774c 100644
   // Check whether there is an available prerendered page for this navigation if
   // this is not for guest. If it exists, take WebContents pre-created for
   // hosting the prerendered page instead of creating new WebContents.
-@@ -9155,6 +9174,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
+@@ -9156,6 +9175,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
   }
 
   CloseListenerManager::DidChangeFocusedFrame(this);
--- a/patch/patches/webkit_plugin_info_2015.patch
+++ b/patch/patches/webkit_plugin_info_2015.patch
@ -15,7 +15,7 @@ index 700e93a9ed053..9d5d1f67adb07 100644
   static void InitializeMainThreadCommon(
       Platform* platform,
 diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc
-index e773961ed731e..13ff106677ace 100644
+index bc9094123bfcf..021cb3cfdefb1 100644
 --- third_party/blink/renderer/core/inspector/devtools_session.cc
 +++ third_party/blink/renderer/core/inspector/devtools_session.cc
@@ -16,6 +16,7 @@