mirror of
https://github.com/Alex313031/thorium.git
synced 2025-01-09 19:37:30 -03:00
M115 stage 4
This commit is contained in:
Alexander Frick
parent
3021d3b692
commit
e9e01a62e1
15 changed files with 186 additions and 78 deletions
|
|
@ -1,6 +1,6 @@
|
|||
google_api_key = "AIzaSyBOti4mM-6x9WDnZIjIeyEU21OpBXqWBgw"
|
||||
google_default_client_id = "77185425430.apps.googleusercontent.com"
|
||||
google_default_client_secret = "OTJgUOQcT7lO7GsGZq2G4IlT"
|
||||
google_api_key = ""
|
||||
google_default_client_id = ""
|
||||
google_default_client_secret = ""
|
||||
target_os = "android"
|
||||
target_cpu = "x64"
|
||||
v8_target_cpu = "x64"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ V8 Font Rendering Patch > https://github.com/saiarcot895/chromium-ubuntu-build/b
|
|||
VAAPI Patch > https://github.com/saiarcot895/chromium-ubuntu-build/blob/master/debian/patches/enable-vaapi-on-linux.diff
|
||||
- Modified by me.
|
||||
|
||||
~~ VAAPI on Wayland Patch > https://github.com/ungoogled-software/ungoogled-chromium-archlinux/blob/master/ozone-add-va-api-support-to-wayland.patch ~~ REMOVED
|
||||
REMOVED ~~VAAPI on Wayland Patch > https://github.com/ungoogled-software/ungoogled-chromium-archlinux/blob/master/ozone-add-va-api-support-to-wayland.patch~~
|
||||
- From Arch AUR ~~
|
||||
|
||||
Use default search icon instead of search engine icon in omnibox patch > https://github.com/ungoogled-software/contrib/blob/master/tweaks/visual/default-search-icon.patch
|
||||
|
|
@ -175,7 +175,7 @@ Enable double click to close tab flag - https://github.com/bigfoxtail/brave-core
|
|||
- Found by @gz83, modified by me.
|
||||
|
||||
Enable close confirmation patch - https://github.com/ungoogled-software/ungoogled-chromium/blob/master/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
|
||||
- Modfied by me.
|
||||
- Modified by me.
|
||||
|
||||
CFI Ignores Patch - https://github.com/RobRich999/Chromium_Clang/blob/150e755bdb3f2c389ab3d485f38d62a36414e73a/Linux/linux64-avx.patch#L386
|
||||
- Made by RobRich999
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@
|
|||
<DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/115.0.5790.172:chrome/browser/ui/views/frame/browser_root_view.cc;bpv=1" ADD_DATE="1685602782" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">browser_root_view.cc - Chromium Code Search</A>
|
||||
</DL><p>
|
||||
<DT><A HREF="https://source.chromium.org/" ADD_DATE="1661054752" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">Chromium Code Search</A>
|
||||
<DT><A HREF="https://source.chromium.org/chromiumos/chromiumos/codesearch/+/refs/tags/115.0.5790.172:src/overlays/overlay-amd64-generic/;bpv=1" ADD_DATE="1661054752" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">overlay-amd64-generic - Chromium Code Search</A>
|
||||
<DT><A HREF="https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/overlays/overlay-amd64-generic/;bpv=1" ADD_DATE="1661054752" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">overlay-amd64-generic - Chromium Code Search</A>
|
||||
<DT><A HREF="https://chromiumdash.appspot.com/" ADD_DATE="1661054752" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADGklEQVQ4jV2TT2hcZRTFz73ve997M/NmqmMy7ZjWNqXTiBahpkHFKhFKpV2IItmZRUEQChYXIoggs3CvYJFCFN1UpOI2ZVyliLtUURNStWSSQkOZ6WQS8978ee/7vuui1YYeuGdxOWd1+BH+lxBAAgBnzswH9pmnJiF2HBYwIs1bK/PXb169MHw4S9ilmZkrXlx77rw18raxZoJIBU4E1mZDYv8GCX258Ok3XwB191+H7p+cfv9mhQmXKSidyoYxnE0BgRUBjHMevACeKsBm/QZsd/anz59tAwADAkx/Hdps8B1Ynxom7ZQks5klt5U47iaOB5adSY3txZupQfhqz0aXgSsaECIAOD+389Ht9c4n3c3uMAgC/5+hcLXsu+OHfSII/lzvSaubci5UzglMGD2mNcXvfvvxxEWaqbeifUfKSzvtzoHV5VUZcJ5fPJbH69MVLN1RAIDJsRSrzU007xKignZhLiIjbsV6nUlVPlh62Rp3IHp0D3Q+5IhSvPHKOC5eU9joOAiAH0sBPjy7FzZnkGTMymcEyq+JFx1nj3iEFBMxu9Lj+2VqIi9Ld3xsdBxGIqHRCNTetvj5L8GRsUBYh6J93+lQ+cQyroxLSSEHk1nkS0WUqw5ZZiBEEAACiDzY6/73ngEA9y21bWrEimNfOVqPC3TiEKRSJLR2IK1tR6MlwskaudtbJEqRODDbTDK2epWm662otr/4h6f8J5xJpZeCJw9CpsYdLa4JmAjHqgZxqqTTD8BwonOaTGaWu9trU7xQr8TG8Vee9thamFADi2tCP1xnRKEHTywavw7QThQpTyBg4/tgk8mlC2drQwaEmhvbn/WTdFEXcoGzkoY+5G7s0FgGGr9n2FsuSE57zhgxxT0q6MW2kUb+HESIAWChXol3kuTNQTJY1IV8IOSzz4SArHuyym7fSMCOlFd8ROt+z17tb/XeeucEZSAS2sWEnJ79rVA9efQ9JjonRIc0xHv+KCHw1QBwK454bvYF79LuFR7QKEKge4i+9sGNYjhWfWmskI1OTeTToVHN+Wt///J9/en04ey/zIWKNexIPpIAAAAASUVORK5CYII=">Chromium Dash</A>
|
||||
<DT><A HREF="https://thorium.rocks/githubstat2/" ADD_DATE="1661054752" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADFklEQVQ4jVVTS2hdVRRda59zP++++NI2Fdv4wYo603lAgwVbUSxoNYKBtFYxHUSR2CoUP1GhCXVQQXTQDqrNwEaTYkE60ImV2FQcCR0UKojUUFpq6Ete3/29e852cNOBe7Ine23WWqxF1EMACgC79743LLBjURA8e7nLd37fuhTmycDhoizPisHJ1szcIupjElC7/kB37RpPooG7PyU5LsLABhEoPQMxJo6CLVT/WuV1T+fQ6PHOSuddHv8hBQABwJ1jB5vxpsEzURRPQL1xlcu99+pVFeoV3mvuXO5UTV8cTjQ33nHm2tjOpgIUANqSviNRnOwo8rRUVQCwJCgkQbBmC6uqWE2LspVEO8LBTUcIqDy/54MhCvcXReYAWAAgaz9qcVBAtd4AANvJCheI7F85ODIkQhk3JrCqXgGSJFTBGqIKUgE6EA6AI+g80GtYAxH7qiXwmHeVkrUf6j1AURJaAQKvMZLQ9qOyAAEh4DWAEaCqXrQg7/XeUZUQASBS06XInVIRsf6ystx7U9LkX4haA8ABMADU28reVkbWSgm4II7DNL011zq3Nsfls9nNS3YzyuRR592qtWLoHLwxoHprAVwRMQ+qOoXShXEjKLLs1MLsx6MHlg6ffiOf+XXDxUM/rw32zWzYYhJ0HGAIGKK94lJR1UUxlqoow7gRFHl+amH2o9EDS9PfhkmyO2ny6MsDXzzSunT1gVs33J9ZqbjZdt0qcxXFz4kDj7leWUaNZlwW2TcLJ6dGJ89PzweN+KVstVv2Su/u7+/OvvLQ0Wf6/r76RKX4q9XHZl7Ce6cnCAAv7J06RspdC19PPff2+envwiQeydeyHggLqJKiUcOYa51w31d/TP7Ye3zrb93U/7Rx+PrrBMCRkcn4nklA3ebTjVbydL6aZoBGWicQUPU0poobJrrRMW99Xrz//fUw6mzb3m4LAJ2f/ywrin4Dh3+KTpYHjbBBY2Q9wxRrjA1MVBau7Dfpw8lT6fK27e327Rr/r84T5z4ZCkX2KTAM8D4oAOIKvC72Kn/iyyc/vKC63hBA/wPSw3rMomR9HwAAAABJRU5ErkJggg==">GitHubStat v2</A>
|
||||
</DL><p>
|
||||
|
|
|
|||
24
src/BUILD.gn
24
src/BUILD.gn
|
|
@ -282,7 +282,7 @@ group("gn_all") {
|
|||
|
||||
deps += root_extra_deps
|
||||
|
||||
if (enable_printing) {
|
||||
if (enable_printing || enable_printing_unittests) {
|
||||
deps += [ "//printing:printing_unittests" ]
|
||||
}
|
||||
|
||||
|
|
@ -637,7 +637,6 @@ group("gn_all") {
|
|||
if (is_win) {
|
||||
deps += [
|
||||
"//base:pe_image_test",
|
||||
"//chrome/chrome_cleaner",
|
||||
"//chrome/chrome_elf:chrome_elf_unittests",
|
||||
"//chrome/chrome_elf:dll_hash_main",
|
||||
"//chrome/elevation_service:elevation_service_unittests",
|
||||
|
|
@ -862,8 +861,8 @@ group("all_rust") {
|
|||
# cross-compiling.
|
||||
if (enable_rust_gnrt && host_os == target_os && host_cpu == target_cpu) {
|
||||
deps += [
|
||||
"//tools/crates/gnrt:gnrt_unittests",
|
||||
"//tools/crates/gnrt($host_toolchain)",
|
||||
"//tools/crates/gnrt/lib:gnrt_unittests",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -891,10 +890,6 @@ if (enable_remoting && ((is_linux && ozone_platform_x11) ||
|
|||
"//remoting/host:host",
|
||||
"//tools/traffic_annotation:annotations_xml",
|
||||
]
|
||||
|
||||
if (is_win) {
|
||||
deps += [ "//chrome/chrome_cleaner:shipped_binaries" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1041,7 +1036,10 @@ if (is_chromeos_ash) {
|
|||
]
|
||||
}
|
||||
if (use_v4l2_codec) {
|
||||
data_deps += [ "//media/gpu/v4l2:v4l2_stateless_decoder" ]
|
||||
data_deps += [
|
||||
"//media/gpu/v4l2:v4l2_stateless_decoder",
|
||||
"//media/gpu/v4l2:v4l2_unittest",
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1212,9 +1210,9 @@ if (!is_ios && !is_cronet_build) {
|
|||
if (is_fuchsia) {
|
||||
data_deps += [
|
||||
"//build/config/fuchsia:deployment_resources",
|
||||
"//content/shell:thorium_shell_fuchsia",
|
||||
"//content/shell:thorium_shell_pkg__archive-manifest",
|
||||
"//content/shell:thorium_shell_pkg__archive-metadata",
|
||||
"//content/shell:content_shell_fuchsia",
|
||||
"//content/shell:content_shell_pkg__archive-manifest",
|
||||
"//content/shell:content_shell_pkg__archive-metadata",
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -1632,10 +1630,11 @@ if (!is_ios && !is_cronet_build) {
|
|||
"//third_party/catapult/devil/",
|
||||
"//third_party/catapult/dependency_manager/",
|
||||
"//third_party/catapult/third_party/typ/",
|
||||
"//third_party/depot_tools/pylint-1.5",
|
||||
"//third_party/depot_tools/pylint-2.7",
|
||||
"//third_party/depot_tools/pylint_main.py",
|
||||
"//third_party/depot_tools/pylintrc",
|
||||
"//third_party/ply/",
|
||||
"//third_party/pyjson5/",
|
||||
"//third_party/wpt_tools/",
|
||||
"//tools/idl_parser/",
|
||||
]
|
||||
|
|
@ -1768,6 +1767,7 @@ if (is_chromeos_ash && enable_js_type_check) {
|
|||
"chrome/browser/resources:closure_compile",
|
||||
"chrome/test/data/webui:closure_compile",
|
||||
"mojo/public/tools/bindings/generators/js_templates/lite/test:closure_compile",
|
||||
"mojo/public/tools/bindings/generators/js_templates/lite/test:closure_compile_modules",
|
||||
"ui/file_manager:closure_compile",
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,6 +72,15 @@ if (is_win && enable_resource_allowlist_generation) {
|
|||
_chrome_resource_allowlist = "$target_gen_dir/chrome_resource_allowlist.txt"
|
||||
}
|
||||
|
||||
# Thorium target that simply pulls in the chrome target as a dependency
|
||||
group("thorium") {
|
||||
deps = [ ":chrome" ]
|
||||
|
||||
if (is_win) {
|
||||
deps += [ ":chrome_dll" ]
|
||||
}
|
||||
}
|
||||
|
||||
if (is_win) {
|
||||
action("reorder_imports") {
|
||||
script = "//build/win/reorder-imports.py"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) 2023 Alex313031. -->
|
||||
|
||||
<grit-part>
|
||||
<message name="IDS_APP_MANAGEMENT_CAMERA" desc="Label for the camera permission toggle.">
|
||||
Camera
|
||||
|
|
@ -60,7 +59,7 @@
|
|||
Opening <ph name="BEGIN_LINK"><a href="#"></ph>supported links<ph name="END_LINK"></a></ph>
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_INTENT_SHARING_APP_OPEN" desc="Label for the intent sharing option to open in a specified app.">
|
||||
Open in <ph name="APP_NAME">$1<ex>Chrome browser</ex></ph>
|
||||
Open in <ph name="APP_NAME">$1<ex>Thorium browser</ex></ph>
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_INTENT_SHARING_BROWSER_OPEN" desc="Label for the intent sharing option to open in the browser.">
|
||||
Open in Thorium browser
|
||||
|
|
@ -113,7 +112,7 @@
|
|||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_ANDROID" desc="Text for Android app type">
|
||||
Android App
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_CHROME" desc="Text for Chrome app type">
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_CHROME" desc="Text for Thorium app type">
|
||||
Thorium App
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_WEB" desc="Text for Web app type">
|
||||
|
|
@ -122,16 +121,16 @@
|
|||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_SYSTEM" desc="Text for System app type">
|
||||
System App
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_CROS_SYSTEM" desc="Text for ChromeOS System app type">
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_CROS_SYSTEM" desc="Text for ThoriumOS System app type">
|
||||
ThoriumOS System App
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_INSTALL_SOURCE_WEB_STORE" desc="Text for Chrome Web Store installation source">
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_INSTALL_SOURCE_WEB_STORE" desc="Text for Thorium Web Store installation source">
|
||||
Thorium Web Store
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_INSTALL_SOURCE_PLAY_STORE" desc="Text for Google Play Store installation source">
|
||||
Google Play Store
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_INSTALL_SOURCE_BROWSER" desc="Text for Chrome browser installation source for Web App">
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_INSTALL_SOURCE_BROWSER" desc="Text for Thorium browser installation source for Web App">
|
||||
Web App installed from Thorium browser
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_AND_SOURCE_COMBINED" desc="Full text for installation source and app type line">
|
||||
|
|
@ -152,6 +151,18 @@
|
|||
<message name="IDS_APP_MANAGEMENT_ARC_MANAGE_PERMISSIONS" desc="Label for a link to manage permissions and more settings for an app.">
|
||||
Manage permissions and settings
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_PERMISSION_ASK" desc="Label explaining that the user will be asked whether an app can access a permission (e.g. camera access) every time it is used.">
|
||||
Ask every time
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_PERMISSION_ALLOWED" desc="Label explaining that access to a permission (e.g. camera access) is allowed for an app.">
|
||||
Allowed
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_PERMISSION_ALLOWED_WITH_DETAILS" desc="Label explaining that access to a permission (e.g. camera access) is allowed for an app. The placeholder after the dash provides additional details about what access is allowed.">
|
||||
Allowed – <ph name="PERMISSION_DETAILS">$1<ex>While in use</ex></ph>
|
||||
</message>
|
||||
<message name="IDS_APP_MANAGEMENT_PERMISSION_DENIED" desc="Label explaining that access to a permission (e.g. camera access) is denied for an app.">
|
||||
Denied
|
||||
</message>
|
||||
|
||||
<!-- File Handling -->
|
||||
<message name="IDS_APP_MANAGEMENT_FILE_HANDLING_HEADER" desc="Main text for toggling a web app's ability to use the File Handling API. This controls whether the app can appear in an 'Open With' list in a file's context menu.">
|
||||
|
|
@ -168,7 +179,7 @@
|
|||
</message>
|
||||
</if>
|
||||
<if expr="is_chromeos">
|
||||
<message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing the ChromeOS Files app) and a link to a learn more link for default filetype associations.">
|
||||
<message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing the ThoriumOS Files app) and a link to a learn more link for default filetype associations.">
|
||||
You can open and edit supported files with this app from the Files app or other apps. To control which files open this app by default, <ph name="BEGIN_LINK"><a href="#"></ph>learn how to set default apps on your device<ph name="END_LINK"></a></ph>.
|
||||
</message>
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@
|
|||
#include <map>
|
||||
|
||||
#include "base/base64.h"
|
||||
#include "base/cxx17_backports.h"
|
||||
#include "base/strings/strcat.h"
|
||||
#include "chrome/browser/ash/borealis/borealis_credits.h"
|
||||
#include "chrome/browser/ash/crosapi/browser_manager.h"
|
||||
|
|
@ -78,6 +77,7 @@
|
|||
#include "chromeos/ash/components/system/statistics_provider.h"
|
||||
#include "components/language/core/common/locale_util.h"
|
||||
#include "third_party/cros_system_api/dbus/service_constants.h"
|
||||
#include "third_party/zlib/google/compression_utils.h"
|
||||
#endif
|
||||
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
#include "chrome/browser/lacros/lacros_url_handling.h"
|
||||
|
|
@ -283,10 +283,12 @@ class ChromeOSCreditsHandler
|
|||
ChromeOSCreditsHandler(const ChromeOSCreditsHandler&) = delete;
|
||||
ChromeOSCreditsHandler& operator=(const ChromeOSCreditsHandler&) = delete;
|
||||
|
||||
// |prefix| allows tests to specify different location for the credits files.
|
||||
static void Start(const std::string& path,
|
||||
content::URLDataSource::GotDataCallback callback) {
|
||||
content::URLDataSource::GotDataCallback callback,
|
||||
const base::FilePath& prefix) {
|
||||
scoped_refptr<ChromeOSCreditsHandler> handler(
|
||||
new ChromeOSCreditsHandler(path, std::move(callback)));
|
||||
new ChromeOSCreditsHandler(path, std::move(callback), prefix));
|
||||
handler->StartOnUIThread();
|
||||
}
|
||||
|
||||
|
|
@ -294,8 +296,9 @@ class ChromeOSCreditsHandler
|
|||
friend class base::RefCountedThreadSafe<ChromeOSCreditsHandler>;
|
||||
|
||||
ChromeOSCreditsHandler(const std::string& path,
|
||||
content::URLDataSource::GotDataCallback callback)
|
||||
: path_(path), callback_(std::move(callback)) {}
|
||||
content::URLDataSource::GotDataCallback callback,
|
||||
const base::FilePath& prefix)
|
||||
: path_(path), callback_(std::move(callback)), prefix_(prefix) {}
|
||||
|
||||
virtual ~ChromeOSCreditsHandler() {}
|
||||
|
||||
|
|
@ -308,12 +311,38 @@ class ChromeOSCreditsHandler
|
|||
base::BindOnce(&ChromeOSCreditsHandler::ResponseOnUIThread, this));
|
||||
}
|
||||
|
||||
// LoadCreditsFileAsync first attempts to load the uncompressed credits file.
|
||||
// Then, if that's not present, it attempts to load and decompress the
|
||||
// compressed credits file.
|
||||
// If both fails, fall back to default contents as handled in
|
||||
// ResponseOnUIThread.
|
||||
void LoadCreditsFileAsync() {
|
||||
base::FilePath credits_file_path(chrome::kChromeOSCreditsPath);
|
||||
if (!base::ReadFileToString(credits_file_path, &contents_)) {
|
||||
if (prefix_.empty()) {
|
||||
prefix_ = base::FilePath(chrome::kChromeOSCreditsPath).DirName();
|
||||
}
|
||||
base::FilePath credits =
|
||||
prefix_.Append(base::FilePath(chrome::kChromeOSCreditsPath).BaseName());
|
||||
if (base::ReadFileToString(credits, &contents_)) {
|
||||
// Decompressed present; return.
|
||||
return;
|
||||
}
|
||||
|
||||
// Decompressed not present; load compressed.
|
||||
base::FilePath compressed_credits = prefix_.Append(
|
||||
base::FilePath(chrome::kChromeOSCreditsCompressedPath).BaseName());
|
||||
std::string compressed;
|
||||
if (!base::ReadFileToString(compressed_credits, &compressed)) {
|
||||
// File with credits not found, ResponseOnUIThread will load credits
|
||||
// from resources if contents_ is empty.
|
||||
contents_.clear();
|
||||
return;
|
||||
}
|
||||
|
||||
// Decompress.
|
||||
if (!compression::GzipUncompress(compressed, &contents_)) {
|
||||
LOG(DFATAL) << "Decompressing os credits failed";
|
||||
contents_.clear();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -337,6 +366,9 @@ class ChromeOSCreditsHandler
|
|||
|
||||
// Chrome OS credits contents that was loaded from file.
|
||||
std::string contents_;
|
||||
|
||||
// Directory containing files to read.
|
||||
base::FilePath prefix_;
|
||||
};
|
||||
|
||||
void OnBorealisCreditsLoaded(content::URLDataSource::GotDataCallback callback,
|
||||
|
|
@ -669,7 +701,8 @@ void AboutUIHTMLSource::StartDataRequest(
|
|||
response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
|
||||
IDR_ABOUT_UI_CREDITS_CSS);
|
||||
} else {
|
||||
ChromeOSCreditsHandler::Start(path, std::move(callback));
|
||||
ChromeOSCreditsHandler::Start(path, std::move(callback),
|
||||
os_credits_prefix_);
|
||||
return;
|
||||
}
|
||||
} else if (source_name_ == chrome::kChromeUICrostiniCreditsHost) {
|
||||
|
|
|
|||
|
|
@ -457,13 +457,13 @@
|
|||
|
||||
<!-- DeviceAuthentication titles-->
|
||||
<if expr="is_macosx">
|
||||
<message name="IDS_PAYMENTS_AUTOFILL_FILLING_MANDATORY_REAUTH" desc="Text that appears in the payments autofill mandatory re-authentication popup, asking the user to authenticate using biometric or device unlock before filling. Please note that on macOS the string 'Google Thorium is trying to' will always come before this string.">
|
||||
<message name="IDS_PAYMENTS_AUTOFILL_FILLING_MANDATORY_REAUTH" desc="Text that appears in the payments autofill mandatory re-authentication popup, asking the user to authenticate using biometric or device unlock before filling. Please note that on macOS the string 'Thorium is trying to' will always come before this string.">
|
||||
verify it's you so it can fill in your payment info.
|
||||
</message>
|
||||
</if>
|
||||
<if expr="is_win">
|
||||
<message name="IDS_PAYMENTS_AUTOFILL_FILLING_MANDATORY_REAUTH" desc="Text that appears in the payments autofill mandatory re-authentication popup, asking the user to authenticate using biometric or device unlock before filling.">
|
||||
Google Thorium is trying to verify it's you so it can fill in your payment info.
|
||||
Thorium is trying to verify it's you so it can fill in your payment info.
|
||||
</message>
|
||||
</if>
|
||||
|
||||
|
|
|
|||
|
|
@ -282,12 +282,12 @@
|
|||
</message>
|
||||
|
||||
<message name="IDS_VERSION_UI_LICENSE" desc="The label below the copyright message, containing the URLs.">
|
||||
Thorium is made possible by the <ph name="BEGIN_LINK_CHROMIUM"><a target="_blank" href="$1"></ph>Thorium<ph name="END_LINK_CHROMIUM"></a></ph> open source project and other <ph name="BEGIN_LINK_OSS"><a target="_blank" href="$2"></ph>open source software<ph name="END_LINK_OSS"></a></ph>.
|
||||
Thorium is made possible by the <ph name="BEGIN_LINK_CHROMIUM"><a target="_blank" href="$1"></ph>Chromium<ph name="END_LINK_CHROMIUM"></a></ph> open source project and other <ph name="BEGIN_LINK_OSS"><a target="_blank" href="$2"></ph>open source software<ph name="END_LINK_OSS"></a></ph>.
|
||||
</message>
|
||||
|
||||
<if expr="chromeos_ash">
|
||||
<message name="IDS_VERSION_UI_LICENSE_CHROMIUM" desc="The label below the copyright message, containing the link to the Thorium project.">
|
||||
Thorium is made possible by the <ph name="BEGIN_LINK_CHROMIUM"><a target="_blank" href="$1"></ph>Thorium<ph name="END_LINK_CHROMIUM"></a></ph> open source project.
|
||||
<message name="IDS_VERSION_UI_LICENSE_CHROMIUM" desc="The label below the copyright message, containing the link to the Chromium project.">
|
||||
Thorium is made possible by the <ph name="BEGIN_LINK_CHROMIUM"><a target="_blank" href="$1"></ph>Chromium<ph name="END_LINK_CHROMIUM"></a></ph> open source project.
|
||||
</message>
|
||||
|
||||
<message name="IDS_VERSION_UI_LICENSE_OTHER" desc="The label below the copyright message, containing the link to other open source software.">
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
</message>
|
||||
<message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_BODY" desc="When a page fails to load, sometimes we suggest checking the network connections. This contains details below the suggestion.">
|
||||
Check any cables and reboot any routers, modems, or other network
|
||||
devices you may be using. Also check that any proxy server currently in use is reachable and configured correctly.
|
||||
devices you may be using.
|
||||
</message>
|
||||
<if expr="not is_ios">
|
||||
|
|
@ -381,7 +382,7 @@
|
|||
</if>
|
||||
<if expr="is_android or is_ios">
|
||||
<message name="IDS_ERRORPAGES_GAME_INSTRUCTIONS" desc="Mobile: Instructions on how to start playing the offline game. 'dino' is an acceptable English nickname that refers to 'dinosaur'">
|
||||
Tap the dino to play
|
||||
Tap the Dino to play
|
||||
</message>
|
||||
<message name="IDS_ERRORPAGE_DINO_GAME_DESCRIPTION" desc="Message to be spoken by a screen reader to give the user context and instructions for playing the net error dino game. Tapping the screen activates the game and causes the dinosaur to jump. Mobile platforms only.">
|
||||
Dino game. A pixelated dinosaur dodges cacti and pterodactyls as it runs across a desolate landscape. When you hear an audio cue, tap to jump over obstacles.
|
||||
|
|
@ -389,7 +390,7 @@
|
|||
</if>
|
||||
<if expr="not is_android and not is_ios">
|
||||
<message name="IDS_ERRORPAGES_GAME_INSTRUCTIONS" desc="Instructions on how to start playing the offline game.">
|
||||
Press space to play
|
||||
Press Space or the Up Arrow to Play
|
||||
</message>
|
||||
<message name="IDS_ERRORPAGE_DINO_GAME_DESCRIPTION" desc="Message to be spoken by a screen reader to give the user context and instructions for playing the net error dino game. Pressing space activates the game and causes the dinosaur to jump. Desktop platforms only.">
|
||||
Dino game. A pixelated dinosaur dodges cacti and pterodactyls as it runs across a desolate landscape. When you hear an audio cue, press space to jump over obstacles.
|
||||
|
|
@ -411,6 +412,6 @@
|
|||
Jump!
|
||||
</message>
|
||||
<message name="IDS_ERRORPAGE_DINO_SLOW_SPEED_TOGGLE" desc="Label for a toggle which allows a user to select a slower speed for the dino game.">
|
||||
Start slower
|
||||
Start slower?
|
||||
</message>
|
||||
</grit-part>
|
||||
|
|
|
|||
|
|
@ -131,6 +131,15 @@ button {
|
|||
outline: none;
|
||||
}
|
||||
|
||||
@media (forced-colors: active) {
|
||||
:focus-visible {
|
||||
/* Outline is needed for Windows HCM. Color of outline does not matter; it
|
||||
* is overridden by the OS. */
|
||||
box-shadow: none;
|
||||
outline: 2px solid transparent;
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
#flagsTemplate {
|
||||
background: rgba(255, 255, 255, .04);
|
||||
|
|
|
|||
|
|
@ -661,7 +661,7 @@
|
|||
Go to permission settings
|
||||
</message>
|
||||
<message name="IDS_PAGE_INFO_PERMISSIONS_SUBPAGE_REMEMBER_THIS_SETTING" desc="The text near the checkbox, that controls if user's decision will be remembered for this permission, in permission's subpage in page info bubble.">
|
||||
Allow on every visit
|
||||
Remember this setting
|
||||
</message>
|
||||
<message name="IDS_PAGE_INFO_RESET_PERMISSIONS" desc="The label of the button to reset permissions for a site.">
|
||||
{NUM_PERMISSIONS, plural, =1 {Reset permission} other {Reset permissions}}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ shell_use_toolkit_views = toolkit_views && !is_castos
|
|||
|
||||
declare_args() {
|
||||
content_shell_product_name = "Thorium Shell"
|
||||
content_shell_version = "999.77.34.5"
|
||||
content_shell_version = "999.0.3434.555"
|
||||
content_shell_major_version = "999"
|
||||
}
|
||||
|
||||
|
|
@ -213,8 +213,19 @@ static_library("content_shell_lib") {
|
|||
|
||||
if (is_ios) {
|
||||
sources += [
|
||||
"browser/bluetooth/ios/shell_bluetooth_chooser_coordinator.h",
|
||||
"browser/bluetooth/ios/shell_bluetooth_chooser_coordinator.mm",
|
||||
"browser/bluetooth/ios/shell_bluetooth_chooser_ios.h",
|
||||
"browser/bluetooth/ios/shell_bluetooth_chooser_ios.mm",
|
||||
"browser/bluetooth/ios/shell_bluetooth_chooser_mediator.h",
|
||||
"browser/bluetooth/ios/shell_bluetooth_chooser_mediator.mm",
|
||||
"browser/bluetooth/ios/shell_bluetooth_device_list_consumer.h",
|
||||
"browser/bluetooth/ios/shell_bluetooth_device_list_delegate.h",
|
||||
"browser/bluetooth/ios/shell_bluetooth_device_list_view_controller.h",
|
||||
"browser/bluetooth/ios/shell_bluetooth_device_list_view_controller.mm",
|
||||
"browser/bluetooth/shell_bluetooth_delegate_impl_client.cc",
|
||||
"browser/bluetooth/shell_bluetooth_delegate_impl_client.h",
|
||||
"browser/shell_browser_main_parts_ios.mm",
|
||||
"browser/shell_file_select_helper.cc",
|
||||
"browser/shell_file_select_helper.h",
|
||||
"browser/shell_platform_delegate_ios.mm",
|
||||
|
|
@ -287,7 +298,6 @@ static_library("content_shell_lib") {
|
|||
"//components/variations/service",
|
||||
"//components/web_cache/renderer",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/common:main_frame_counter",
|
||||
"//content/public/common",
|
||||
"//content/test:content_test_mojo_bindings",
|
||||
|
|
@ -363,6 +373,7 @@ static_library("content_shell_lib") {
|
|||
if (is_ios) {
|
||||
deps += [
|
||||
"//components/permissions",
|
||||
"//components/strings:components_strings",
|
||||
"//services/tracing/public/cpp",
|
||||
"//services/tracing/public/mojom:mojom",
|
||||
"//ui/shell_dialogs",
|
||||
|
|
@ -478,10 +489,11 @@ repack("pak") {
|
|||
"$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
|
||||
"$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
|
||||
"$root_gen_dir/content/content_resources.pak",
|
||||
"$root_gen_dir/content/dev_ui_content_resources.pak",
|
||||
"$root_gen_dir/content/gpu_resources.pak",
|
||||
"$root_gen_dir/content/histograms_resources.pak",
|
||||
"$root_gen_dir/content/process_resources.pak",
|
||||
"$root_gen_dir/content/quota_internals_resources.pak",
|
||||
"$root_gen_dir/content/service_worker_resources.pak",
|
||||
"$root_gen_dir/content/shell/shell_resources.pak",
|
||||
"$root_gen_dir/content/test/web_ui_mojo_test_resources.pak",
|
||||
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
|
||||
|
|
@ -502,7 +514,6 @@ repack("pak") {
|
|||
":resources",
|
||||
"//base/tracing/protos:chrome_track_event_resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/browser/resources:resources",
|
||||
"//content/browser/resources/media:resources",
|
||||
"//content/browser/webrtc/resources",
|
||||
|
|
@ -523,6 +534,17 @@ repack("pak") {
|
|||
sources += [ "$root_gen_dir/content/browser/tracing/tracing_resources.pak" ]
|
||||
}
|
||||
|
||||
if (is_ios) {
|
||||
sources += [
|
||||
"$root_gen_dir/device/bluetooth/strings/bluetooth_strings_en-US.pak",
|
||||
"${root_gen_dir}/components/strings/components_strings_en-US.pak",
|
||||
]
|
||||
deps += [
|
||||
"//components/strings:components_strings",
|
||||
"//device/bluetooth/strings/",
|
||||
]
|
||||
}
|
||||
|
||||
if (shell_use_toolkit_views) {
|
||||
deps += [ "//ui/views/resources" ]
|
||||
sources +=
|
||||
|
|
@ -537,7 +559,7 @@ repack("pak") {
|
|||
}
|
||||
|
||||
if (is_android) {
|
||||
group("thorium_shell") {
|
||||
group("content_shell") {
|
||||
testonly = true
|
||||
deps = [ "//content/shell/android:content_shell_apk" ]
|
||||
}
|
||||
|
|
@ -593,7 +615,7 @@ if (is_android) {
|
|||
"//build/config/ios/entitlements.plist"
|
||||
}
|
||||
|
||||
ios_app_bundle("thorium_shell") {
|
||||
ios_app_bundle("content_shell") {
|
||||
info_plist = "app/ios-Info.plist"
|
||||
testonly = true
|
||||
|
||||
|
|
@ -670,24 +692,24 @@ if (is_android) {
|
|||
fuchsia_component("content_shell_component") {
|
||||
testonly = true
|
||||
manifest = "fuchsia/content_shell.cml"
|
||||
data_deps = [ ":thorium_shell" ]
|
||||
data_deps = [ ":content_shell" ]
|
||||
visibility = [ ":*" ]
|
||||
}
|
||||
|
||||
fuchsia_package("thorium_shell_pkg") {
|
||||
fuchsia_package("content_shell_pkg") {
|
||||
testonly = true
|
||||
package_name = "thorium_shell"
|
||||
package_name = "content_shell"
|
||||
deps = [ ":content_shell_component" ]
|
||||
}
|
||||
|
||||
fuchsia_package_installer("thorium_shell_fuchsia") {
|
||||
fuchsia_package_installer("content_shell_fuchsia") {
|
||||
testonly = true
|
||||
visibility = [
|
||||
":*", # See https://crbug.com/1328459#c4.
|
||||
"//:*",
|
||||
]
|
||||
package = ":thorium_shell_pkg"
|
||||
package_name = "thorium_shell"
|
||||
package = ":content_shell_pkg"
|
||||
package_name = "content_shell"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ END
|
|||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
IDR_MAINFRAME ICON "thorium_shell.ico"
|
||||
IDI_THORIUM_SHELL ICON "thorium_shell.ico"
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
|
|
|
|||
|
|
@ -577,7 +577,6 @@ static_library("test_support") {
|
|||
"//ui/accessibility:ax_enums_mojo",
|
||||
"//ui/base",
|
||||
"//ui/base:test_support",
|
||||
"//ui/base:ui_data_pack",
|
||||
"//ui/base/clipboard",
|
||||
"//ui/base/clipboard:clipboard_test_support",
|
||||
"//ui/base/ime",
|
||||
|
|
@ -975,11 +974,11 @@ static_library("browsertest_support") {
|
|||
"../public/test/content_browser_test_utils.h",
|
||||
"../public/test/content_cert_verifier_browser_test.cc",
|
||||
"../public/test/content_cert_verifier_browser_test.h",
|
||||
"../public/test/resource_load_observer.cc",
|
||||
"../public/test/resource_load_observer.h",
|
||||
"content_browser_test_utils_internal.cc",
|
||||
"content_browser_test_utils_internal.h",
|
||||
"content_test_launcher.cc",
|
||||
"resource_load_observer.cc",
|
||||
"resource_load_observer.h",
|
||||
]
|
||||
|
||||
public_deps = [
|
||||
|
|
@ -1268,6 +1267,7 @@ test("content_browsertests") {
|
|||
"../browser/attribution_reporting/attribution_internals_browsertest.cc",
|
||||
"../browser/attribution_reporting/attribution_src_browsertest.cc",
|
||||
"../browser/attribution_reporting/attributions_browsertest.cc",
|
||||
"../browser/attribution_reporting/cross_app_web_attribution_browsertest.cc",
|
||||
"../browser/attribution_reporting/privacy_sandbox_ads_apis_browsertest.cc",
|
||||
"../browser/attribution_reporting/source_declaration_browsertest.cc",
|
||||
"../browser/attribution_reporting/trigger_registration_browsertest.cc",
|
||||
|
|
@ -1296,6 +1296,7 @@ test("content_browsertests") {
|
|||
"../browser/browsing_topics/browsing_topics_browsertest.cc",
|
||||
"../browser/child_process_launcher_browsertest.cc",
|
||||
"../browser/child_process_security_policy_browsertest.cc",
|
||||
"../browser/compute_pressure/compute_pressure_origin_trial_browsertest.cc",
|
||||
"../browser/content_index/content_index_browsertest.cc",
|
||||
"../browser/content_security_policy_browsertest.cc",
|
||||
"../browser/cross_origin_opener_policy_browsertest.cc",
|
||||
|
|
@ -1391,6 +1392,7 @@ test("content_browsertests") {
|
|||
"../browser/network/sandboxed_http_cache_browsertest.cc",
|
||||
"../browser/network/sandboxed_nqe_browsertest.cc",
|
||||
"../browser/network/sandboxed_socket_broker_browsertest.cc",
|
||||
"../browser/network/shared_dictionary_browsertest.cc",
|
||||
"../browser/network/split_cache_browsertest.cc",
|
||||
"../browser/network/transferable_socket_browsertest.cc",
|
||||
"../browser/network/trust_token_browsertest.cc",
|
||||
|
|
@ -1410,6 +1412,7 @@ test("content_browsertests") {
|
|||
"../browser/portal/portal_navigation_throttle_browsertest.cc",
|
||||
"../browser/power_monitor_browsertest.cc",
|
||||
"../browser/preloading/anchor_element_interaction_browsertest.cc",
|
||||
"../browser/preloading/preloading_decider_browsertest.cc",
|
||||
"../browser/preloading/prerender/prerender_browsertest.cc",
|
||||
"../browser/process_internals/process_internals_browsertest.cc",
|
||||
"../browser/quota/quota_browsertest.cc",
|
||||
|
|
@ -1523,8 +1526,12 @@ test("content_browsertests") {
|
|||
"../browser/web_contents/web_contents_view_aura_browsertest.cc",
|
||||
"../browser/web_package/signed_exchange_request_handler_browsertest.cc",
|
||||
"../browser/web_package/signed_exchange_subresource_prefetch_browsertest.cc",
|
||||
"../browser/webid/test/mock_identity_request_dialog_controller.cc",
|
||||
"../browser/webid/test/mock_identity_request_dialog_controller.h",
|
||||
"../browser/webid/test/mock_mdoc_provider.cc",
|
||||
"../browser/webid/test/mock_mdoc_provider.h",
|
||||
"../browser/webid/test/mock_modal_dialog_view_delegate.cc",
|
||||
"../browser/webid/test/mock_modal_dialog_view_delegate.h",
|
||||
"../browser/webid/test/webid_test_content_browser_client.cc",
|
||||
"../browser/webid/test/webid_test_content_browser_client.h",
|
||||
"../browser/webid/webid_browsertest.cc",
|
||||
|
|
@ -1606,7 +1613,6 @@ test("content_browsertests") {
|
|||
":test_interfaces",
|
||||
":web_ui_mojo_test_resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
]
|
||||
|
||||
deps = [
|
||||
|
|
@ -1736,10 +1742,17 @@ test("content_browsertests") {
|
|||
"//ui/webui:test_support",
|
||||
]
|
||||
|
||||
data = [
|
||||
"data/",
|
||||
"//media/test/data/",
|
||||
]
|
||||
if (is_ios) {
|
||||
bundle_deps = [
|
||||
":content_test_bundle_data",
|
||||
"//media/test:media_bundle_data",
|
||||
]
|
||||
} else {
|
||||
data = [
|
||||
"data/",
|
||||
"//media/test/data/",
|
||||
]
|
||||
}
|
||||
|
||||
data_deps = [
|
||||
"//content/shell:pak",
|
||||
|
|
@ -1863,6 +1876,8 @@ test("content_browsertests") {
|
|||
"//third_party/isimpledom",
|
||||
]
|
||||
|
||||
data_deps += [ "//services/test/echo:echo_preload_library" ]
|
||||
|
||||
libs = [ "uiautomationcore.lib" ]
|
||||
|
||||
configs += [ "//build/config/win:delayloads" ]
|
||||
|
|
@ -1961,7 +1976,9 @@ test("content_browsertests") {
|
|||
"//content/public/browser:proto",
|
||||
"//ui/base/clipboard:clipboard_test_support",
|
||||
]
|
||||
data += [ "//content/test/data/clipboard/" ]
|
||||
if (!is_ios) {
|
||||
data += [ "//content/test/data/clipboard/" ]
|
||||
}
|
||||
}
|
||||
if (is_posix) {
|
||||
deps += [ "//services/tracing:test_utils" ]
|
||||
|
|
@ -2013,7 +2030,7 @@ test("content_browsertests") {
|
|||
"../browser/keyboard_lock_browsertest_ios.mm",
|
||||
"../browser/pointer_lock_browsertest_ios.mm",
|
||||
]
|
||||
bundle_deps = [ ":content_shell_pak_bundle_data" ]
|
||||
bundle_deps += [ ":content_shell_pak_bundle_data" ]
|
||||
}
|
||||
|
||||
if (is_chromeos_ash) {
|
||||
|
|
@ -2213,6 +2230,7 @@ test("content_unittests") {
|
|||
"../browser/attribution_reporting/attribution_storage_unittest.cc",
|
||||
"../browser/attribution_reporting/attribution_utils_unittest.cc",
|
||||
"../browser/attribution_reporting/combinatorics_unittest.cc",
|
||||
"../browser/attribution_reporting/destination_throttler_unittest.cc",
|
||||
"../browser/attribution_reporting/rate_limit_table_unittest.cc",
|
||||
"../browser/background_fetch/background_fetch_cross_origin_filter_unittest.cc",
|
||||
"../browser/background_fetch/background_fetch_data_manager_unittest.cc",
|
||||
|
|
@ -2251,7 +2269,7 @@ test("content_unittests") {
|
|||
"../browser/browsing_data/clear_site_data_handler_unittest.cc",
|
||||
"../browser/browsing_topics/browsing_topics_site_data_manager_impl_unittest.cc",
|
||||
"../browser/browsing_topics/browsing_topics_site_data_storage_unittest.cc",
|
||||
"../browser/browsing_topics/browsing_topics_url_loader_service_unittest.cc",
|
||||
"../browser/browsing_topics/browsing_topics_url_loader_unittest.cc",
|
||||
"../browser/browsing_topics/header_util_unittest.cc",
|
||||
"../browser/buckets/bucket_manager_host_unittest.cc",
|
||||
"../browser/buckets/bucket_utils_unittest.cc",
|
||||
|
|
@ -2340,6 +2358,7 @@ test("content_unittests") {
|
|||
"../browser/indexed_db/mock_mojo_indexed_db_database_callbacks.cc",
|
||||
"../browser/indexed_db/mock_mojo_indexed_db_database_callbacks.h",
|
||||
"../browser/interest_group/ad_auction_service_impl_unittest.cc",
|
||||
"../browser/interest_group/ad_auction_url_loader_interceptor_unittest.cc",
|
||||
"../browser/interest_group/auction_metrics_recorder_unittest.cc",
|
||||
"../browser/interest_group/auction_process_manager_unittest.cc",
|
||||
"../browser/interest_group/auction_runner_unittest.cc",
|
||||
|
|
@ -2391,6 +2410,7 @@ test("content_unittests") {
|
|||
"../browser/media/system_media_controls_notifier_unittest.cc",
|
||||
"../browser/media/webaudio/audio_context_manager_impl_unittest.cc",
|
||||
"../browser/memory/swap_metrics_driver_impl_unittest.cc",
|
||||
"../browser/metrics/histogram_shared_memory_config_unittest.cc",
|
||||
"../browser/metrics/histograms_monitor_unittest.cc",
|
||||
"../browser/mojo_binder_policy_applier_unittest.cc",
|
||||
"../browser/mojo_binder_policy_map_impl_unittest.cc",
|
||||
|
|
@ -2511,6 +2531,7 @@ test("content_unittests") {
|
|||
"../browser/renderer_host/media/video_capture_controller_unittest.cc",
|
||||
"../browser/renderer_host/media/video_capture_manager_unittest.cc",
|
||||
"../browser/renderer_host/media/video_capture_unittest.cc",
|
||||
"../browser/renderer_host/mixed_content_checker_unittest.cc",
|
||||
"../browser/renderer_host/mixed_content_navigation_throttle_unittest.cc",
|
||||
"../browser/renderer_host/navigation_controller_impl_unittest.cc",
|
||||
"../browser/renderer_host/navigation_entry_impl_unittest.cc",
|
||||
|
|
@ -2610,6 +2631,7 @@ test("content_unittests") {
|
|||
"../browser/webid/federated_auth_request_impl_registry_unittest.cc",
|
||||
"../browser/webid/federated_auth_request_impl_unittest.cc",
|
||||
"../browser/webid/federated_auth_user_info_request_unittest.cc",
|
||||
"../browser/webid/identity_registry_unittest.cc",
|
||||
"../browser/webid/idp_network_request_manager_unittest.cc",
|
||||
"../browser/webid/test/delegated_idp_network_request_manager.cc",
|
||||
"../browser/webid/test/delegated_idp_network_request_manager.h",
|
||||
|
|
@ -2619,10 +2641,14 @@ test("content_unittests") {
|
|||
"../browser/webid/test/mock_api_permission_delegate.h",
|
||||
"../browser/webid/test/mock_auto_reauthn_permission_delegate.cc",
|
||||
"../browser/webid/test/mock_auto_reauthn_permission_delegate.h",
|
||||
"../browser/webid/test/mock_identity_registry.cc",
|
||||
"../browser/webid/test/mock_identity_registry.h",
|
||||
"../browser/webid/test/mock_identity_request_dialog_controller.cc",
|
||||
"../browser/webid/test/mock_identity_request_dialog_controller.h",
|
||||
"../browser/webid/test/mock_idp_network_request_manager.cc",
|
||||
"../browser/webid/test/mock_idp_network_request_manager.h",
|
||||
"../browser/webid/test/mock_modal_dialog_view_delegate.cc",
|
||||
"../browser/webid/test/mock_modal_dialog_view_delegate.h",
|
||||
"../browser/webid/test/mock_permission_delegate.cc",
|
||||
"../browser/webid/test/mock_permission_delegate.h",
|
||||
"../browser/webrtc/webrtc_internals_message_handler_unittest.cc",
|
||||
|
|
@ -2634,6 +2660,7 @@ test("content_unittests") {
|
|||
"../browser/webui/web_ui_unittest.cc",
|
||||
"../browser/webui/web_ui_url_loader_factory_unittest.cc",
|
||||
"../browser/webui/web_ui_webui_js_bridge_unittest.cc",
|
||||
"../browser/webui/webui_config_map_unittest.cc",
|
||||
"../browser/worker_host/dedicated_worker_service_impl_unittest.cc",
|
||||
"../browser/worker_host/mock_shared_worker.cc",
|
||||
"../browser/worker_host/mock_shared_worker.h",
|
||||
|
|
@ -2766,17 +2793,14 @@ test("content_unittests") {
|
|||
if (is_ios) {
|
||||
bundle_deps = [
|
||||
":content_shell_pak_bundle_data",
|
||||
":content_unittests_bundle_data",
|
||||
":content_test_bundle_data",
|
||||
"//media/test:media_bundle_data",
|
||||
]
|
||||
}
|
||||
|
||||
configs += [ "//build/config:precompiled_headers" ]
|
||||
|
||||
public_deps = [
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
]
|
||||
public_deps = [ "//content:content_resources" ]
|
||||
|
||||
deps = [
|
||||
":content_test_mojo_bindings",
|
||||
|
|
@ -2963,13 +2987,10 @@ test("content_unittests") {
|
|||
}
|
||||
|
||||
if (is_fuchsia) {
|
||||
deps += [
|
||||
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics:fuchsia.accessibility.semantics_cpp",
|
||||
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics:fuchsia.accessibility.semantics_hlcpp",
|
||||
]
|
||||
deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics:fuchsia.accessibility.semantics_cpp" ]
|
||||
}
|
||||
|
||||
if (enable_printing) {
|
||||
if (enable_printing || enable_printing_unittests) {
|
||||
deps += [
|
||||
"//printing",
|
||||
"//printing/backend",
|
||||
|
|
@ -2989,7 +3010,6 @@ test("content_unittests") {
|
|||
"../renderer/pepper/event_conversion_unittest.cc",
|
||||
"../renderer/pepper/host_var_tracker_unittest.cc",
|
||||
"../renderer/pepper/mock_resource.h",
|
||||
"../renderer/pepper/resource_creation_impl_unittest.cc",
|
||||
"../renderer/pepper/v8_var_converter_unittest.cc",
|
||||
]
|
||||
deps += [
|
||||
|
|
@ -3136,6 +3156,7 @@ test("content_unittests") {
|
|||
sources += [
|
||||
"../browser/devtools/protocol/webauthn_handler_unittest.cc",
|
||||
"../browser/host_zoom_map_impl_unittest.cc",
|
||||
"../browser/picture_in_picture/document_picture_in_picture_navigation_throttle_unittest.cc",
|
||||
"../browser/serial/serial_unittest.cc",
|
||||
"../browser/speech/endpointer/endpointer_unittest.cc",
|
||||
"../browser/speech/speech_recognition_engine_unittest.cc",
|
||||
|
|
@ -3238,9 +3259,9 @@ if (is_ios) {
|
|||
outputs = [ "{{bundle_resources_dir}}/content_shell.pak" ]
|
||||
}
|
||||
|
||||
bundle_data_from_filelist("content_unittests_bundle_data") {
|
||||
bundle_data_from_filelist("content_test_bundle_data") {
|
||||
testonly = true
|
||||
filelist_name = "content_unittests_bundle_data.filelist"
|
||||
filelist_name = "content_test_bundle_data.filelist"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3308,6 +3329,7 @@ group("gpu_pytype") {
|
|||
|
||||
data = [
|
||||
"//content/test/gpu/run_pytype.py",
|
||||
"//content/test/gpu/unexpected_pass_finder.py",
|
||||
"//content/test/gpu/validate_tag_consistency.py",
|
||||
|
||||
"//content/test/gpu/gold_inexact_matching/",
|
||||
|
|
|
|||
Loading…
Reference in a new issue