PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Enable search engine settings desktop ui: allow build in android desktop mode (#256)

Browse Source
This commit is contained in:
Carmelo Messina
2025-06-03 10:32:42 +02:00
parent 8cafb5ce10
commit 42fc484e3c
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Enable-search-engine-settings-desktop-ui.patch
+21 -11
View File
@@ -31,7 +31,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../browser/search_engines/android/BUILD.gn | 1 +
.../java/res/layout/search_engine_layout.xml | 25 ++
.../settings/SearchEngineSettings.java | 21 ++
chrome/browser/ui/BUILD.gn | 21 ++
chrome/browser/ui/BUILD.gn | 25 ++
.../edit_search_engine_controller.cc | 8 +-
.../edit_search_engine_controller.h | 6 +-
.../keyword_editor_controller.cc | 13 +-
@@ -63,7 +63,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
third_party/polymer/v3_0/BUILD.gn | 12 +-
ui/base/template_expressions.cc | 21 +-
ui/webui/BUILD.gn | 7 +
ui/webui/resources/BUILD.gn | 22 ++
ui/webui/resources/BUILD.gn | 28 ++
.../cr_components/cr_shortcut_input/BUILD.gn | 2 +-
.../customize_color_scheme_mode/BUILD.gn | 2 +-
.../cr_components/help_bubble/BUILD.gn | 2 +-
@@ -78,7 +78,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
ui/webui/resources/images/BUILD.gn | 2 +-
ui/webui/resources/js/BUILD.gn | 2 +-
ui/webui/resources/js/load_time_data.ts | 17 +-
71 files changed, 1151 insertions(+), 70 deletions(-)
71 files changed, 1161 insertions(+), 70 deletions(-)
create mode 100644 chrome/app/settings_strings_android.grdp
create mode 100644 chrome/browser/search_engines/android/java/res/layout/search_engine_layout.xml
create mode 100644 chrome/browser/ui/webui/settings/settings_localized_strings_provider_android.cc
@@ -925,7 +925,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
if (is_chrome_branded) {
deps += [ "//components/plus_addresses/resources:vector_icons" ]
}
@@ -1000,6 +1006,21 @@ static_library("ui") {
@@ -1000,6 +1006,25 @@ static_library("ui") {
"android/toolbar/extension_actions_bridge_factory.h",
]
}
@@ -938,9 +938,13 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
+ "webui/settings/settings_page_ui_handler.h",
+ "webui/settings/settings_localized_strings_provider_android.cc",
+ "webui/settings/settings_localized_strings_provider_android.h",
+ "webui/favicon_source.cc",
+ "webui/favicon_source.h",
+ ]
+ if (!enable_extensions_core) {
+ sources += [
+ "webui/favicon_source.cc",
+ "webui/favicon_source.h",
+ ]
+ }
+ deps += [
+ "//components/themes:ntp_background_proto",
+ ]
@@ -2165,31 +2169,37 @@ diff --git a/ui/webui/BUILD.gn b/ui/webui/BUILD.gn
diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn
--- a/ui/webui/resources/BUILD.gn
+++ b/ui/webui/resources/BUILD.gn
@@ -50,6 +50,28 @@ generate_grd("build_grd") {
@@ -50,6 +50,34 @@ generate_grd("build_grd") {
"$target_gen_dir/mojo/resources.grdp",
]
+ if (is_android) {
+ public_deps += [
+ "cr_components/customize_color_scheme_mode:build_grdp",
+ "cr_components/cr_shortcut_input:build_grdp",
+ "cr_components/help_bubble:build_grdp",
+ "cr_components/localized_link:build_grdp",
+ "cr_components/managed_dialog:build_grdp",
+ "cr_components/managed_footnote:build_grdp",
+ "cr_components/theme_color_picker:build_grdp",
+ "//third_party/polymer/v3_0:build_grdp",
+ ]
+ grdp_files += [
+ "$target_gen_dir/cr_components/customize_color_scheme_mode/resources.grdp",
+ "$target_gen_dir/cr_components/cr_shortcut_input/resources.grdp",
+ "$target_gen_dir/cr_components/help_bubble/resources.grdp",
+ "$target_gen_dir/cr_components/localized_link/resources.grdp",
+ "$target_gen_dir/cr_components/managed_dialog/resources.grdp",
+ "$target_gen_dir/cr_components/managed_footnote/resources.grdp",
+ "$target_gen_dir/cr_components/theme_color_picker/resources.grdp",
+ "$root_gen_dir/third_party/polymer/v3_0/polymer_3_0_resources.grdp",
+ ]
+ if (!is_desktop_android) {
+ public_deps += [
+ "cr_components/cr_shortcut_input:build_grdp",
+ "cr_components/managed_footnote:build_grdp",
+ ]
+ grdp_files += [
+ "$target_gen_dir/cr_components/cr_shortcut_input/resources.grdp",
+ "$target_gen_dir/cr_components/managed_footnote/resources.grdp",
+ ]
+ }
+ }
if ((!is_android && !is_ios) || is_desktop_android) {
public_deps += [