From c40fa414022b21ad85d7b6f149cfda467f32e4d2 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Sat, 2 May 2026 01:06:33 +0100 Subject: [PATCH] [cr149] `//chrome/browser/ui/navigator` componentised Chromium changes: https://chromium.googlesource.com/chromium/src/+/a7ea861d95f70515cbddad5ea07b29ba144f5659 commit a7ea861d95f70515cbddad5ea07b29ba144f5659 Author: Foromo Daniel Soromou Date: Thu Apr 30 08:15:42 2026 -0700 Extract browser navigator into a separate build target NOTE: This change is trivial and do not change any behavior. Extract the browser navigator code and its associated parameters from the monolithic `chrome/browser/ui` build target into a dedicated `chrome/browser/ui/navigator` directory and build configuration. This refactoring establishes a new standalone build file containing dedicated source sets for the navigator component. Consequently, the `browser_navigator_params_headers` source set and related source files are removed from `chrome/browser/ui/BUILD.gn`. Numerous build files across the `chrome/browser` directory are updated to replace the old dependency with the new `//chrome/browser/ui/navigator` target. This modularization decouples UI components, streamlines dependency management, and improves overall build structure. A follow up CL will move the files under c/b/ui/navigator and rename the include places. Bug: none Change-Id: I65c10afadfb1dc3857a3714cdbce6d06201633ab Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7803848 Reviewed-by: Dana Fried Reviewed-by: Kaan Alsan Commit-Queue: Foromo Daniel Soromou Cr-Commit-Position: refs/heads/main@{#1623210} --- browser/net/BUILD.gn | 2 +- browser/ui/BUILD.gn | 7 +------ browser/ui/sidebar/BUILD.gn | 2 +- browser/ui/split_view/BUILD.gn | 2 +- browser/ui/tabs/test/BUILD.gn | 2 +- browser/ui/toolbar/BUILD.gn | 2 +- browser/ui/views/side_panel/ai_chat/BUILD.gn | 2 +- browser/ui/webui/BUILD.gn | 2 +- browser/ui/webui/settings/BUILD.gn | 2 +- browser/ui/webui/tab_search/BUILD.gn | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 18 +++++------------- test/BUILD.gn | 2 +- 12 files changed, 16 insertions(+), 29 deletions(-) diff --git a/browser/net/BUILD.gn b/browser/net/BUILD.gn index e77bc68681d..2984b6a3d5a 100644 --- a/browser/net/BUILD.gn +++ b/browser/net/BUILD.gn @@ -44,7 +44,7 @@ source_set("browser_tests") { "//chrome/browser/content_settings:content_settings_factory", "//chrome/browser/profiles:profile", "//chrome/browser/ui", - "//chrome/browser/ui:browser_navigator_params_headers", + "//chrome/browser/ui/navigator", "//chrome/test:test_support", "//components/content_settings/core/browser", "//components/content_settings/core/browser:cookie_settings", diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn index 3eff5e90257..3ef58d1be94 100644 --- a/browser/ui/BUILD.gn +++ b/browser/ui/BUILD.gn @@ -50,11 +50,6 @@ group("ui_public_dependencies") { ] } -group("browser_navigator_params_headers_public_dependencies") { - visibility = [ "//chrome/browser/ui:browser_navigator_params_headers" ] - public_deps = [ "//brave/components/containers/buildflags" ] -} - source_set("ui") { # Depend on //chrome/browser/ui instead of //brave/browser/ui. visibility = [ @@ -95,9 +90,9 @@ source_set("ui") { "//chrome/browser/contextual_search", "//chrome/browser/history", "//chrome/browser/image_fetcher", - "//chrome/browser/ui:browser_navigator_params_headers", "//chrome/browser/ui:tab_search_feature", "//chrome/browser/ui/browser_window", + "//chrome/browser/ui/navigator", "//chrome/browser/ui/select_file_policy", "//chrome/browser/ui/startup", "//chrome/browser/ui/tabs:tabs_public", diff --git a/browser/ui/sidebar/BUILD.gn b/browser/ui/sidebar/BUILD.gn index c05200527aa..814b8c4bbfa 100644 --- a/browser/ui/sidebar/BUILD.gn +++ b/browser/ui/sidebar/BUILD.gn @@ -61,9 +61,9 @@ source_set("sidebar_impl") { "//chrome/browser/profiles", "//chrome/browser/search", "//chrome/browser/search_engines", - "//chrome/browser/ui:browser_navigator_params_headers", "//chrome/browser/ui:ui_features", "//chrome/browser/ui/browser_window", + "//chrome/browser/ui/navigator", "//chrome/browser/ui/side_panel", "//chrome/browser/ui/side_panel:side_panel_views_dependent", "//chrome/browser/ui/tabs:tab_strip", diff --git a/browser/ui/split_view/BUILD.gn b/browser/ui/split_view/BUILD.gn index 4d54a620940..8f899875967 100644 --- a/browser/ui/split_view/BUILD.gn +++ b/browser/ui/split_view/BUILD.gn @@ -15,9 +15,9 @@ source_set("split_view") { deps = [ "//base", - "//chrome/browser/ui:browser_navigator_params_headers", "//chrome/browser/ui:ui_features", "//chrome/browser/ui/browser_window", + "//chrome/browser/ui/navigator", "//chrome/browser/ui/tabs:tab_strip", "//components/tabs:public", "//content/public/browser", diff --git a/browser/ui/tabs/test/BUILD.gn b/browser/ui/tabs/test/BUILD.gn index e33783a43c6..3118cafe182 100644 --- a/browser/ui/tabs/test/BUILD.gn +++ b/browser/ui/tabs/test/BUILD.gn @@ -20,7 +20,7 @@ source_set("browser_tests") { "//chrome/browser/profiles:profile", "//chrome/browser/tab_group_sync:factories", "//chrome/browser/ui", - "//chrome/browser/ui:browser_navigator_params_headers", + "//chrome/browser/ui/navigator", "//components/prefs", "//content/test:test_support", "//ui/base", diff --git a/browser/ui/toolbar/BUILD.gn b/browser/ui/toolbar/BUILD.gn index 05131510c3a..1345a48ac38 100644 --- a/browser/ui/toolbar/BUILD.gn +++ b/browser/ui/toolbar/BUILD.gn @@ -54,8 +54,8 @@ source_set("brave_app_menu_browser_tests") { "//chrome/browser", "//chrome/browser:browser_process", "//chrome/browser/sync", - "//chrome/browser/ui:browser_navigator_params_headers", "//chrome/browser/ui/browser_window", + "//chrome/browser/ui/navigator", "//chrome/test:test_support", "//chrome/test:test_support_ui", "//components/constrained_window", diff --git a/browser/ui/views/side_panel/ai_chat/BUILD.gn b/browser/ui/views/side_panel/ai_chat/BUILD.gn index e9e024b0c78..107ed94b4cf 100644 --- a/browser/ui/views/side_panel/ai_chat/BUILD.gn +++ b/browser/ui/views/side_panel/ai_chat/BUILD.gn @@ -22,8 +22,8 @@ source_set("ai_chat") { "//brave/components/constants", "//brave/components/resources:strings_grit", "//chrome/browser/profiles", - "//chrome/browser/ui:browser_navigator_params_headers", "//chrome/browser/ui/browser_window", + "//chrome/browser/ui/navigator", "//chrome/browser/ui/side_panel", "//chrome/browser/ui/side_panel:side_panel_views_dependent", "//chrome/browser/ui/views/side_panel", diff --git a/browser/ui/webui/BUILD.gn b/browser/ui/webui/BUILD.gn index 8cd9d981157..3ecde654ae4 100644 --- a/browser/ui/webui/BUILD.gn +++ b/browser/ui/webui/BUILD.gn @@ -18,7 +18,7 @@ source_set("browser_tests") { "//chrome/browser/profiles", "//chrome/browser/search_engines", "//chrome/browser/ui", - "//chrome/browser/ui:browser_navigator_params_headers", + "//chrome/browser/ui/navigator", "//chrome/test", "//chrome/test:test_support", "//components/omnibox/browser", diff --git a/browser/ui/webui/settings/BUILD.gn b/browser/ui/webui/settings/BUILD.gn index c489db8cfee..be10718b8b3 100644 --- a/browser/ui/webui/settings/BUILD.gn +++ b/browser/ui/webui/settings/BUILD.gn @@ -26,7 +26,7 @@ source_set("unit_tests") { "//chrome/browser/regional_capabilities", "//chrome/browser/search_engines", "//chrome/browser/ui", - "//chrome/browser/ui:browser_navigator_params_headers", + "//chrome/browser/ui/navigator", "//chrome/test:test_support", "//components/browsing_data/content:test_support", "//components/regional_capabilities", diff --git a/browser/ui/webui/tab_search/BUILD.gn b/browser/ui/webui/tab_search/BUILD.gn index 4806f8ef13f..f21dc42bbec 100644 --- a/browser/ui/webui/tab_search/BUILD.gn +++ b/browser/ui/webui/tab_search/BUILD.gn @@ -22,7 +22,7 @@ source_set("browser_tests") { "//brave/components/ai_chat/core/common/mojom", "//brave/components/resources:strings_grit", "//chrome/browser/ui", - "//chrome/browser/ui:browser_navigator_params_headers", + "//chrome/browser/ui/navigator", "//chrome/test", "//chrome/test:test_support", "//testing/gtest", diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 67b9d19d600..51945484f29 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 3317c37b6e000e356daf163a01e21bc9f88c97f6..ece0644ef821b917873f278b202dfd9311e71af1 100644 +index a788e4c6b6ba3746529c25385630fe2909a94232..454916c9b4dc8deafae405d0070f86024b309a4b 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -891,6 +891,7 @@ static_library("ui") { +@@ -941,6 +941,7 @@ static_library("ui") { # split out yet. "//chrome/browser/webauthn:impl", ] @@ -10,7 +10,7 @@ index 3317c37b6e000e356daf163a01e21bc9f88c97f6..ece0644ef821b917873f278b202dfd93 if (enable_vr && is_win) { deps += [ "//chrome/browser/vr:vr_base" ] -@@ -3471,7 +3472,10 @@ static_library("ui") { +@@ -3542,7 +3543,10 @@ static_library("ui") { "//chrome/updater/app/server/win:updater_legacy_idl", ] } else { @@ -22,7 +22,7 @@ index 3317c37b6e000e356daf163a01e21bc9f88c97f6..ece0644ef821b917873f278b202dfd93 } } -@@ -5598,6 +5602,7 @@ group("ui_public_dependencies") { +@@ -5658,6 +5662,7 @@ group("ui_public_dependencies") { "//components/enterprise/buildflags", "//components/paint_preview/buildflags", "//components/safe_browsing:buildflags", @@ -30,7 +30,7 @@ index 3317c37b6e000e356daf163a01e21bc9f88c97f6..ece0644ef821b917873f278b202dfd93 "//components/segmentation_platform/public", "//components/sync", "//components/sync_user_events", -@@ -5610,6 +5615,7 @@ group("ui_public_dependencies") { +@@ -5670,6 +5675,7 @@ group("ui_public_dependencies") { if (enable_extensions_core) { public_deps += [ "//extensions/browser" ] } @@ -38,11 +38,3 @@ index 3317c37b6e000e356daf163a01e21bc9f88c97f6..ece0644ef821b917873f278b202dfd93 if (!is_android) { public_deps += [ "//build:branding_buildflags", -@@ -5748,6 +5754,7 @@ source_set("browser_navigator_params_headers") { - "//url", - ] - deps = [] -+ public_deps += [ "//brave/browser/ui:browser_navigator_params_headers_public_dependencies" ] - } - - if (!is_android) { diff --git a/test/BUILD.gn b/test/BUILD.gn index e96c7f7db88..a36e4655617 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -1063,12 +1063,12 @@ test("brave_browser_tests") { "//chrome/browser/sync", "//chrome/browser/tab_list", "//chrome/browser/ui", - "//chrome/browser/ui:browser_navigator_params_headers", "//chrome/browser/ui:tab_search_feature", "//chrome/browser/ui/browser_window:create_browser_window", "//chrome/browser/ui/color:color_headers", "//chrome/browser/ui/color:mixers", "//chrome/browser/ui/hats", + "//chrome/browser/ui/navigator", "//chrome/browser/ui/omnibox", "//chrome/browser/ui/startup", "//chrome/browser/ui/tabs:tabs_public",