diff --git a/DEPS b/DEPS index c68672d0f06e..58aeaa902adb 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '137.0.7149.0', + '137.0.7151.0', 'node_version': 'v22.14.0', 'nan_version': diff --git a/patches/chromium/build_allow_electron_to_use_exec_script.patch b/patches/chromium/build_allow_electron_to_use_exec_script.patch index 5c806ee5442b..28413b2100db 100644 --- a/patches/chromium/build_allow_electron_to_use_exec_script.patch +++ b/patches/chromium/build_allow_electron_to_use_exec_script.patch @@ -6,10 +6,10 @@ Subject: build: allow electron to use exec_script This is similar to the //build usecase so we're OK adding ourselves here diff --git a/.gn b/.gn -index 09c0044a0eb116efc03f4406a29003e7948a39bb..a185f4f0c7061a2b12895196583bd256e06614fb 100644 +index ae58a0b0a64ae1fdb3f9cd8587041d71a121c6b9..7a1373c1cb78133375071cf5479561b64376b4dc 100644 --- a/.gn +++ b/.gn -@@ -168,4 +168,26 @@ exec_script_allowlist = +@@ -167,4 +167,26 @@ exec_script_allowlist = "//tools/grit/grit_rule.gni", "//tools/gritsettings/BUILD.gn", diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index 2cfff2297020..cee7fdd1fc1a 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch @@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this patch. diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 39ef34bbd58d51d8453dcb076bb6e45ec78a3832..119d7e409b46995ff602989e9308e2d39f6820ed 100644 +index 4b3f01018a9dea91b46b5917e099f272582991b2..8250f2e447ff19829cfae3f00b3df70b47749874 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -200,11 +200,16 @@ if (!is_android && !is_mac) { @@ -33,10 +33,10 @@ index 39ef34bbd58d51d8453dcb076bb6e45ec78a3832..119d7e409b46995ff602989e9308e2d3 "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 03805c70105cf375bb5959a6b30d91e1c86a2466..c817919101f77b4571964b94007f9204b5873248 100644 +index ad39862fdd9a5a4f827f36e6a9778223a638d831..518ab769287525b1977387df56d1f50d1f0778f2 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4617,7 +4617,7 @@ static_library("browser") { +@@ -4627,7 +4627,7 @@ static_library("browser") { [ "//chrome/browser/ui/webui/signin:profile_impl" ] } @@ -46,10 +46,10 @@ index 03805c70105cf375bb5959a6b30d91e1c86a2466..c817919101f77b4571964b94007f9204 # than here in :chrome_dll. deps += [ "//chrome:packed_resources_integrity_header" ] diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 99aa117b2ade28e6e41068e463703e816eb3da55..2572a43601d5e10a894b9fe08c038ea97c024e9a 100644 +index 1b52a0d1a249c5d8beb205358c2003202c9253a0..4fbf2f66adfccb3580176be8d25598cf9ffcb616 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7174,9 +7174,12 @@ test("unit_tests") { +@@ -7187,9 +7187,12 @@ test("unit_tests") { "//chrome/notification_helper", ] @@ -63,7 +63,7 @@ index 99aa117b2ade28e6e41068e463703e816eb3da55..2572a43601d5e10a894b9fe08c038ea9 "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -8142,6 +8145,10 @@ test("unit_tests") { +@@ -8155,6 +8158,10 @@ test("unit_tests") { "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc", ] @@ -74,7 +74,7 @@ index 99aa117b2ade28e6e41068e463703e816eb3da55..2572a43601d5e10a894b9fe08c038ea9 sources += [ # The importer code is not used on Android. "../common/importer/firefox_importer_utils_unittest.cc", -@@ -8197,7 +8204,6 @@ test("unit_tests") { +@@ -8210,7 +8217,6 @@ test("unit_tests") { # Non-android deps for "unit_tests" target. deps += [ "../browser/screen_ai:screen_ai_install_state", diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index c9862da027ca..81b4b4e65175 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -66,7 +66,7 @@ index 55bb4ae3bab4cdf20b3e1dde9450a5c0e4e62b37..fe444c7fa140166a1b65c7a8a2676e2d // Operation result when the renderer asks the browser to create a new window. diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 0c3731448b236cedd333aa0a9a0b01577596d4bc..cd3ab7d799e31b2ce0f9b7a280121b07d740865d 100644 +index 9c36ad70531bd8c31158c741ab23763ea00bc068..6909f75fb4cbd0e7b4f3067cda52a5f67dc100de 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -821,6 +821,8 @@ bool ContentBrowserClient::CanCreateWindow( @@ -79,7 +79,7 @@ index 0c3731448b236cedd333aa0a9a0b01577596d4bc..cd3ab7d799e31b2ce0f9b7a280121b07 bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index d8b137849e15749e011b1c8ae1cb78cd0ed47844..f25e2eaeacfef82ca904e40f8b7b3913a121db9d 100644 +index f1fee091b84aec20f1e15dcc90917e50bb47d1c6..3a7a6dc0a4e75c151379f8488d371439a808f1a9 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -199,6 +199,7 @@ class NetworkService; diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch index b407289361af..bde95238b2ff 100644 --- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch +++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch @@ -80,10 +80,10 @@ index 4fd8dff1089cd6afa6a66dc185734d7671657281..0a1f4268ea771a3d5d4a2668928c6e5d content::WebContents* source, const content::OpenURLParams& params, diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index acb3a3aa595f3e6694270c928b9422388c0f25a5..670f77936863c686aca70072e9d42293463a6a28 100644 +index 435235c067f70f7f3d219dfc0bf91c9be40d1389..cc6c860ec51075fc047a77c26c5b42296bb6ab19 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -2314,12 +2314,11 @@ bool Browser::IsWebContentsCreationOverridden( +@@ -2323,12 +2323,11 @@ bool Browser::IsWebContentsCreationOverridden( content::SiteInstance* source_site_instance, content::mojom::WindowContainerType window_container_type, const GURL& opener_url, diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch index 1525e073aa30..cd77c50fe3ed 100644 --- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch +++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch @@ -112,7 +112,7 @@ index 99bf736ebe303d46ab1ced924ba929a0cd258909..e10c8782d2704ff9cff8062d201a4339 string mime_type; diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc -index 3e081d9cd2ce10dc0e8039c7d2272d9eb8722888..d4f980aeb42620af6c3f51ff4d0efc688ecda1af 100644 +index 937a7b2ba05c11514d2d980a6fb2eaa9102c2774..6ffe746744beccbf224ad1a36ad102da5164580f 100644 --- a/services/network/url_loader.cc +++ b/services/network/url_loader.cc @@ -387,6 +387,9 @@ URLLoader::URLLoader( @@ -134,7 +134,7 @@ index 3e081d9cd2ce10dc0e8039c7d2272d9eb8722888..d4f980aeb42620af6c3f51ff4d0efc68 url_request_->SetResponseHeadersCallback(base::BindRepeating( &URLLoader::SetRawResponseHeaders, base::Unretained(this))); } -@@ -1224,6 +1227,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { +@@ -1225,6 +1228,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { } response_ = BuildResponseHead(); @@ -153,7 +153,7 @@ index 3e081d9cd2ce10dc0e8039c7d2272d9eb8722888..d4f980aeb42620af6c3f51ff4d0efc68 + } DispatchOnRawResponse(); - ad_auction_event_record_request_helper_.HandleResponse(*url_request_); + ad_auction_event_record_request_helper_.HandleResponse( diff --git a/services/network/url_loader.h b/services/network/url_loader.h index 6832aca0d487d5cbf2fc445f1f07a17565cf9d45..78618a2c3d79455ff685d58d11b61d3d8468b7e1 100644 --- a/services/network/url_loader.h diff --git a/patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch b/patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch index 47337811918c..e15e46d03be5 100644 --- a/patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch +++ b/patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch @@ -58,7 +58,7 @@ index 6c36ada80f6f225b84a8f3832405128f8ba83224..714d582d1060873765b24770b18eddcb NOTREACHED(); } diff --git a/third_party/blink/common/permissions/permission_utils.cc b/third_party/blink/common/permissions/permission_utils.cc -index 8abbc34ec283562685a46e10142901110b5c0b55..1c436c62cac1bc4b21255bdcbb2c18b882c4058b 100644 +index b19b5781f426bdfd4a8b6dfbead0f854545ca90a..9833c25f97e55ab7e7095243c307a90fbf4b53d8 100644 --- a/third_party/blink/common/permissions/permission_utils.cc +++ b/third_party/blink/common/permissions/permission_utils.cc @@ -101,6 +101,8 @@ std::string GetPermissionString(PermissionType permission) { @@ -71,9 +71,9 @@ index 8abbc34ec283562685a46e10142901110b5c0b55..1c436c62cac1bc4b21255bdcbb2c18b8 NOTREACHED(); } @@ -175,6 +177,7 @@ PermissionTypeToPermissionsPolicyFeature(PermissionType permission) { + case PermissionType::NOTIFICATIONS: + case PermissionType::KEYBOARD_LOCK: case PermissionType::POINTER_LOCK: - // TODO(crbug.com/394009026): Add permission policy for LNA. - case PermissionType::LOCAL_NETWORK_ACCESS: + case PermissionType::DEPRECATED_SYNC_CLIPBOARD_READ: return std::nullopt; @@ -141,7 +141,7 @@ index c269698764bb8ae7f85c5d476436f5ae5209576d..65d7fd94128a755609192784722074c6 bool ClipboardCommands::ExecuteCopy(LocalFrame& frame, diff --git a/third_party/blink/renderer/modules/permissions/permission_utils.cc b/third_party/blink/renderer/modules/permissions/permission_utils.cc -index 843a4f27807071eabfdbffce589a31ddac75aacb..8d189eae97caa48a5796c540a74aaafa2fa676ff 100644 +index 691726eb23434005adc559534fc0aeede937cc92..a980ed6afb84eceef9c9b594b325e8e3783821ec 100644 --- a/third_party/blink/renderer/modules/permissions/permission_utils.cc +++ b/third_party/blink/renderer/modules/permissions/permission_utils.cc @@ -145,6 +145,8 @@ String PermissionNameToString(PermissionName name) { diff --git a/patches/chromium/fix_adjust_headless_mode_handling_in_native_widget.patch b/patches/chromium/fix_adjust_headless_mode_handling_in_native_widget.patch index d9643893e5c8..88353892f985 100644 --- a/patches/chromium/fix_adjust_headless_mode_handling_in_native_widget.patch +++ b/patches/chromium/fix_adjust_headless_mode_handling_in_native_widget.patch @@ -15,7 +15,7 @@ We also need to ensure that an initial paint is scheduled when the compositor is unsuspended in headles mode. diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm -index 1d77de15d281c597c1cb3dbca04eb4d8e16cc11d..187bb87a0b356551e2260f480de326c574aa914b 100644 +index b51482ecbb8eaed649ae0ea9dd9c7c71125b51a2..0180a182a8b55df4e515d77f696fa442ab31ae01 100644 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm @@ -663,9 +663,10 @@ void HandleAccelerator(const ui::Accelerator& accelerator, @@ -31,10 +31,10 @@ index 1d77de15d281c597c1cb3dbca04eb4d8e16cc11d..187bb87a0b356551e2260f480de326c5 // Register the CGWindowID (used to identify this window for video capture) diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h -index 9087ed4c1035104e4c5f32e86f81dae6aad09d3d..18f82c39b63269daf34a91d805c94070de9cd271 100644 +index 65154f18c7ce737ea1b48ebd9308896d8a13f622..ec821403356d2d45c9c12831a89704be10ee05f7 100644 --- a/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h -@@ -1239,6 +1239,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, +@@ -1238,6 +1238,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, // True if widget was created in headless mode. bool is_headless() const { return is_headless_; } diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 0313d2b80302..9364009c8107 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -20,7 +20,7 @@ index d26c850e28b7df6992bf07fda2abe260ed4da769..008c131e5b4f84daeaee5ffe6ab7ae88 } diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index f25e2eaeacfef82ca904e40f8b7b3913a121db9d..d0993b89a686dcc0428b2ef0bc3f20dfc7a49199 100644 +index 3a7a6dc0a4e75c151379f8488d371439a808f1a9..0869aef8fce2829f7827d36c73af65ad71f7fdd3 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -340,6 +340,11 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch index 039b403e09cc..b76ccfc88ca5 100644 --- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch +++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch @@ -11,10 +11,10 @@ If removing this patch causes no sync failures, it's safe to delete :+1: Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py -index 8f419c43dcb0bb4b882d04db7fadbcd25560ece0..709cca39197ef74c304cdef1cab750f244f9bf29 100755 +index 108d33c2e6380749b80631b57931af6beaf44404..ad7b3f3a4e0190983ee68b1503a38847d9f94014 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py -@@ -304,6 +304,8 @@ def GetDefaultHostOs(): +@@ -307,6 +307,8 @@ def GetDefaultHostOs(): 'win32': 'win', } default_host_os = _PLATFORM_HOST_OS_MAP.get(sys.platform, sys.platform) diff --git a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch index f8c10c55f379..2f4cc22ce20a 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -35,7 +35,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to system priority. diff --git a/base/BUILD.gn b/base/BUILD.gn -index acec47a0be2986a4d7fe1e1284db0260e5814d6c..69a68e3776f142ab77f838a7c1827b1de99d4605 100644 +index 59721ed3c9e26fd83c553d82030f3e76af0c3dfd..e8a9715e9004e5d10aa96298332237c78796bf5b 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1045,6 +1045,7 @@ component("base") { @@ -582,7 +582,7 @@ index eca43bf620111c27c400ae2d95880e47c34fbc59..12ee7e75e437426f28002c7c9f4d5f5b return kAttributes; } diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 327caa3eae27370786cb66184c1ba48f1767b3ee..aa109c5c123613dfb7258267830eaa859c1d95d1 100644 +index 3256304fe1bfb80af0312f9046b1a78a2469956e..29281a0d8a4383ed4b2d5d8bac934acd54040aa8 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -342,6 +342,7 @@ source_set("browser") { @@ -797,7 +797,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe } // namespace content diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn -index b61e76a3b9136931cb6280ddfecff82889725a16..99bc0b5f06e11d67b598ec4b0d6262ae359ffc27 100644 +index 126c0d51647ef46a12b2c47930f7bd49e55dd736..d61474fb3478a27450a037f50d2a734097eb4ca9 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -662,6 +662,7 @@ static_library("test_support") { @@ -824,7 +824,7 @@ index b61e76a3b9136931cb6280ddfecff82889725a16..99bc0b5f06e11d67b598ec4b0d6262ae ] if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) { -@@ -3282,6 +3285,7 @@ test("content_unittests") { +@@ -3283,6 +3286,7 @@ test("content_unittests") { "//ui/shell_dialogs:shell_dialogs", "//ui/webui:test_support", "//url", @@ -1960,7 +1960,7 @@ index dcbd888db4ffec7b960bca18837c5210eb99bd87..2583e94b7de865ab5f02566760e9994a // Used to force the NSApplication's focused accessibility element to be the // views::Views accessibility tree when the NSView for this is focused. diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm -index cfd4c6bd099edfcf10ed33be000c665a6d4af16e..1d77de15d281c597c1cb3dbca04eb4d8e16cc11d 100644 +index 32a3747e3fad70ba7665c1080863058bfb8a07d0..b51482ecbb8eaed649ae0ea9dd9c7c71125b51a2 100644 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm @@ -21,6 +21,7 @@ @@ -1997,7 +1997,7 @@ index cfd4c6bd099edfcf10ed33be000c665a6d4af16e..1d77de15d281c597c1cb3dbca04eb4d8 } remote_cocoa::mojom::NativeWidgetNSWindow* -@@ -1407,9 +1416,11 @@ void HandleAccelerator(const ui::Accelerator& accelerator, +@@ -1414,9 +1423,11 @@ void HandleAccelerator(const ui::Accelerator& accelerator, // for PWAs. However this breaks accessibility on in-process windows, // so set it back to NO when a local window gains focus. See // https://crbug.com/41485830. @@ -2009,7 +2009,7 @@ index cfd4c6bd099edfcf10ed33be000c665a6d4af16e..1d77de15d281c597c1cb3dbca04eb4d8 // Explicitly set the keyboard accessibility state on regaining key // window status. if (is_key && is_content_first_responder) { -@@ -1550,17 +1561,20 @@ void HandleAccelerator(const ui::Accelerator& accelerator, +@@ -1557,17 +1568,20 @@ void HandleAccelerator(const ui::Accelerator& accelerator, void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens( const std::vector& window_token, const std::vector& view_token) { @@ -2030,7 +2030,7 @@ index cfd4c6bd099edfcf10ed33be000c665a6d4af16e..1d77de15d281c597c1cb3dbca04eb4d8 *pid = getpid(); id element_id = GetNativeViewAccessible(); -@@ -1573,6 +1587,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator, +@@ -1580,6 +1594,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator, } *token = ui::RemoteAccessibility::GetTokenForLocalElement(element_id); diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 2b9e1c9a1001..b0a9a4b666db 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -881,10 +881,10 @@ index 97cb6458bc9eec767db89b56abfc5f4b4136ff7b..d9a0b343158b8464b5c9aa8e0e655c0b ScriptingThrottler scripting_throttler_; diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index aa109c5c123613dfb7258267830eaa859c1d95d1..5efe601ba6bf950779a0de0ae15c5d820b52d8a5 100644 +index 29281a0d8a4383ed4b2d5d8bac934acd54040aa8..0b943e7a4324b8ce9524d76f1cf4c6a2f187c595 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -3157,8 +3157,9 @@ source_set("browser") { +@@ -3159,8 +3159,9 @@ source_set("browser") { "//ppapi/shared_impl", ] diff --git a/patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch b/patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch index fe0710eaaf09..e31a8e462260 100644 --- a/patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch +++ b/patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch @@ -80,7 +80,7 @@ index 714d582d1060873765b24770b18eddcbbdcf5506..3746bafd72223a65c4183a59726601e8 NOTREACHED(); } diff --git a/third_party/blink/common/permissions/permission_utils.cc b/third_party/blink/common/permissions/permission_utils.cc -index 1c436c62cac1bc4b21255bdcbb2c18b882c4058b..929302db8d21c0cf8c16fc167a7b2110a400abfa 100644 +index 9833c25f97e55ab7e7095243c307a90fbf4b53d8..6489d1c932fc8e92e13af55227088fa1c169dcd6 100644 --- a/third_party/blink/common/permissions/permission_utils.cc +++ b/third_party/blink/common/permissions/permission_utils.cc @@ -101,8 +101,23 @@ std::string GetPermissionString(PermissionType permission) { @@ -107,11 +107,10 @@ index 1c436c62cac1bc4b21255bdcbb2c18b882c4058b..929302db8d21c0cf8c16fc167a7b2110 case PermissionType::NUM: NOTREACHED(); } -@@ -177,7 +192,16 @@ PermissionTypeToPermissionsPolicyFeature(PermissionType permission) { +@@ -177,7 +192,15 @@ PermissionTypeToPermissionsPolicyFeature(PermissionType permission) { + case PermissionType::NOTIFICATIONS: + case PermissionType::KEYBOARD_LOCK: case PermissionType::POINTER_LOCK: - // TODO(crbug.com/394009026): Add permission policy for LNA. - case PermissionType::LOCAL_NETWORK_ACCESS: -+ return std::nullopt; + + // Permissions added by Electron case PermissionType::DEPRECATED_SYNC_CLIPBOARD_READ: @@ -124,7 +123,7 @@ index 1c436c62cac1bc4b21255bdcbb2c18b882c4058b..929302db8d21c0cf8c16fc167a7b2110 return std::nullopt; case PermissionType::NUM: -@@ -345,9 +369,26 @@ std::optional PermissionDescriptorInfoToPermissionType( +@@ -345,9 +368,26 @@ std::optional PermissionDescriptorInfoToPermissionType( return PermissionType::HAND_TRACKING; case PermissionName::WEB_PRINTING: return PermissionType::WEB_PRINTING; @@ -198,7 +197,7 @@ index e47f2089a6a187b26c981afa1ef4135ec5e6a9e7..d66eb48c619dde34c59f33c5aaa0e38c struct MidiPermissionDescriptor { diff --git a/third_party/blink/renderer/modules/permissions/permission_utils.cc b/third_party/blink/renderer/modules/permissions/permission_utils.cc -index 8d189eae97caa48a5796c540a74aaafa2fa676ff..fd3e12b88df9c944256358129ca3df1ac3f168d6 100644 +index a980ed6afb84eceef9c9b594b325e8e3783821ec..ff2898ca035ae5f2bc218615a87ec148e3764385 100644 --- a/third_party/blink/renderer/modules/permissions/permission_utils.cc +++ b/third_party/blink/renderer/modules/permissions/permission_utils.cc @@ -145,8 +145,22 @@ String PermissionNameToString(PermissionName name) { diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index 66a194549f84..2f21e75bd645 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/chromium/resource_file_conflict.patch @@ -52,10 +52,10 @@ Some alternatives to this patch: None of these options seems like a substantial maintainability win over this patch to me (@nornagon). diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 3db6dd6496794e924e87c5cd4c442e5fd90106cf..39ef34bbd58d51d8453dcb076bb6e45ec78a3832 100644 +index 97f843f8133c49d684b415f61ef4b4084c4d345c..4b3f01018a9dea91b46b5917e099f272582991b2 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1559,7 +1559,7 @@ if (is_chrome_branded && !is_android) { +@@ -1554,7 +1554,7 @@ if (is_chrome_branded && !is_android) { } } @@ -64,7 +64,7 @@ index 3db6dd6496794e924e87c5cd4c442e5fd90106cf..39ef34bbd58d51d8453dcb076bb6e45e chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1605,6 +1605,12 @@ repack("browser_tests_pak") { +@@ -1600,6 +1600,12 @@ repack("browser_tests_pak") { deps = [ "//chrome/test/data/webui:resources" ] } diff --git a/patches/chromium/revert_enable_crel_for_arm32_targets.patch b/patches/chromium/revert_enable_crel_for_arm32_targets.patch index 3f2470846e5b..534abda4bf67 100644 --- a/patches/chromium/revert_enable_crel_for_arm32_targets.patch +++ b/patches/chromium/revert_enable_crel_for_arm32_targets.patch @@ -8,7 +8,7 @@ as its one of our supported platforms. https://chromium-review.googlesource.com/q/I3a62f02f564f07be63173b0773b4ecaffbe939b9 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index fca6c92950708307743b4e4f7081ff58ca1ad54c..3d3e9762875f3328cb777d1880d93527e2ed1f70 100644 +index e579cc9a9d1fd01d390a64886f649dc53102166e..de1f3b7b1a33bf5ab4f6922f0cb2d305a8af7550 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -619,7 +619,8 @@ config("compiler") {