[cr141][Linux] Update product logo icons for installer.
Chromium change: https://source.chromium.org/chromium/chromium/src/+/8c28f057f084a5c5ed3993df7d620ccadc3bf003 commit 8c28f057f084a5c5ed3993df7d620ccadc3bf003 Author: Tom Anderson <thomasanderson@chromium.org> Date: Thu Aug 14 11:58:44 2025 -0700 Remove debian.menu from Debian packages The debian.menu files have been replaced with .desktop files in all major desktop environments. This CL removes it, and the old XPM icon resources, which were only used by debian.menu. Finally, fix a bit of nondeterminism exposed by bug 377894390 by sorting the icon list. R=thestig Change-Id: Ia36754d05865e327da0c97b715434a1180ead0c5 Bug: 377894390
@@ -347,6 +347,8 @@ if (!is_ios) {
|
||||
}
|
||||
|
||||
branding_dir = "//chrome/app/theme/$branding_path_component"
|
||||
branding_dir_100 =
|
||||
"//chrome/app/theme/default_100_percent/$branding_path_component"
|
||||
copy("theme_files") {
|
||||
visibility = [ ":*" ]
|
||||
if (is_linux) {
|
||||
@@ -355,6 +357,24 @@ copy("theme_files") {
|
||||
"$branding_dir/linux/product_logo_128_dev.png",
|
||||
"$branding_dir/linux/product_logo_128_development.png",
|
||||
"$branding_dir/linux/product_logo_128_nightly.png",
|
||||
"$branding_dir/linux/product_logo_24_beta.png",
|
||||
"$branding_dir/linux/product_logo_24_dev.png",
|
||||
"$branding_dir/linux/product_logo_24_nightly.png",
|
||||
"$branding_dir/linux/product_logo_256_beta.png",
|
||||
"$branding_dir/linux/product_logo_256_dev.png",
|
||||
"$branding_dir/linux/product_logo_256_nightly.png",
|
||||
"$branding_dir/linux/product_logo_48_beta.png",
|
||||
"$branding_dir/linux/product_logo_48_dev.png",
|
||||
"$branding_dir/linux/product_logo_48_nightly.png",
|
||||
"$branding_dir/linux/product_logo_64_beta.png",
|
||||
"$branding_dir/linux/product_logo_64_dev.png",
|
||||
"$branding_dir/linux/product_logo_64_nightly.png",
|
||||
"$branding_dir_100/linux/product_logo_16_beta.png",
|
||||
"$branding_dir_100/linux/product_logo_16_dev.png",
|
||||
"$branding_dir_100/linux/product_logo_16_nightly.png",
|
||||
"$branding_dir_100/linux/product_logo_32_beta.png",
|
||||
"$branding_dir_100/linux/product_logo_32_dev.png",
|
||||
"$branding_dir_100/linux/product_logo_32_nightly.png",
|
||||
]
|
||||
} else {
|
||||
sources = [
|
||||
|
||||
@@ -231,9 +231,13 @@ def CheckNewThemeFilesForUpstreamOverride(input_api, output_api):
|
||||
|
||||
CHANNEL_DIRS = {'beta', 'dev', 'development', 'nightly'}
|
||||
|
||||
def is_channelized_path(path):
|
||||
def is_channelized_path(path, input_api):
|
||||
# Example: app/theme/chromium/mac/beta/Assets.car
|
||||
parts = path.split('/')
|
||||
# Example: app/theme/chromium/linux/product_logo_24_beta.png
|
||||
parts.extend(
|
||||
input_api.os_path.splitext(
|
||||
input_api.os_path.basename(path))[0].split('_'))
|
||||
return any(part in CHANNEL_DIRS for part in parts)
|
||||
|
||||
source_file_filter = lambda f: input_api.FilterSourceFile(
|
||||
@@ -249,7 +253,7 @@ def CheckNewThemeFilesForUpstreamOverride(input_api, output_api):
|
||||
|
||||
problems = []
|
||||
for f in new_sources:
|
||||
if is_channelized_path(f):
|
||||
if is_channelized_path(f, input_api):
|
||||
continue # Skip checking upstream for channelized files
|
||||
upstream_file = f.replace('/brave/', '/chromium/')
|
||||
path = brave_chromium_utils.wspath(f'//chrome/{upstream_file}')
|
||||
|
||||
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.9 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 30 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.5 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.6 KiB |
|
After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 4.5 KiB |
|
After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 668 B After Width: | Height: | Size: 657 B |
|
After Width: | Height: | Size: 799 B |
|
After Width: | Height: | Size: 781 B |
|
After Width: | Height: | Size: 804 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.9 KiB |