diff --git a/BUILD.gn b/BUILD.gn index 3616f43a6f8..ac99eebb8e1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -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 = [ diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 086d1ce202e..aa415d21d61 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -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}') diff --git a/app/theme/brave/linux/product_logo_128.png b/app/theme/brave/linux/product_logo_128.png index 2c6091025a7..9932b4fd18e 100644 Binary files a/app/theme/brave/linux/product_logo_128.png and b/app/theme/brave/linux/product_logo_128.png differ diff --git a/app/theme/brave/linux/product_logo_128_beta.png b/app/theme/brave/linux/product_logo_128_beta.png index b3b8a004e98..d6059f04e45 100644 Binary files a/app/theme/brave/linux/product_logo_128_beta.png and b/app/theme/brave/linux/product_logo_128_beta.png differ diff --git a/app/theme/brave/linux/product_logo_128_dev.png b/app/theme/brave/linux/product_logo_128_dev.png index 5994e401c7f..8960143e9ff 100644 Binary files a/app/theme/brave/linux/product_logo_128_dev.png and b/app/theme/brave/linux/product_logo_128_dev.png differ diff --git a/app/theme/brave/linux/product_logo_128_nightly.png b/app/theme/brave/linux/product_logo_128_nightly.png index 79e4baea0ec..e44f98baa5f 100644 Binary files a/app/theme/brave/linux/product_logo_128_nightly.png and b/app/theme/brave/linux/product_logo_128_nightly.png differ diff --git a/app/theme/brave/linux/product_logo_24.png b/app/theme/brave/linux/product_logo_24.png index 1193d81f99e..1b2eae14e8b 100644 Binary files a/app/theme/brave/linux/product_logo_24.png and b/app/theme/brave/linux/product_logo_24.png differ diff --git a/app/theme/brave/linux/product_logo_24_beta.png b/app/theme/brave/linux/product_logo_24_beta.png new file mode 100644 index 00000000000..acbe145d295 Binary files /dev/null and b/app/theme/brave/linux/product_logo_24_beta.png differ diff --git a/app/theme/brave/linux/product_logo_24_dev.png b/app/theme/brave/linux/product_logo_24_dev.png new file mode 100644 index 00000000000..07d9fa8e273 Binary files /dev/null and b/app/theme/brave/linux/product_logo_24_dev.png differ diff --git a/app/theme/brave/linux/product_logo_24_nightly.png b/app/theme/brave/linux/product_logo_24_nightly.png new file mode 100644 index 00000000000..724fbf1e963 Binary files /dev/null and b/app/theme/brave/linux/product_logo_24_nightly.png differ diff --git a/app/theme/brave/linux/product_logo_256.png b/app/theme/brave/linux/product_logo_256.png index fada2e190c6..b087108b367 100644 Binary files a/app/theme/brave/linux/product_logo_256.png and b/app/theme/brave/linux/product_logo_256.png differ diff --git a/app/theme/brave/linux/product_logo_256_beta.png b/app/theme/brave/linux/product_logo_256_beta.png new file mode 100644 index 00000000000..74c2d0439a2 Binary files /dev/null and b/app/theme/brave/linux/product_logo_256_beta.png differ diff --git a/app/theme/brave/linux/product_logo_256_dev.png b/app/theme/brave/linux/product_logo_256_dev.png new file mode 100644 index 00000000000..b0aa30362a3 Binary files /dev/null and b/app/theme/brave/linux/product_logo_256_dev.png differ diff --git a/app/theme/brave/linux/product_logo_256_nightly.png b/app/theme/brave/linux/product_logo_256_nightly.png new file mode 100644 index 00000000000..ed070d069d2 Binary files /dev/null and b/app/theme/brave/linux/product_logo_256_nightly.png differ diff --git a/app/theme/brave/linux/product_logo_48.png b/app/theme/brave/linux/product_logo_48.png index 1778d6c298a..88375d002fc 100644 Binary files a/app/theme/brave/linux/product_logo_48.png and b/app/theme/brave/linux/product_logo_48.png differ diff --git a/app/theme/brave/linux/product_logo_48_beta.png b/app/theme/brave/linux/product_logo_48_beta.png new file mode 100644 index 00000000000..fba5842ac63 Binary files /dev/null and b/app/theme/brave/linux/product_logo_48_beta.png differ diff --git a/app/theme/brave/linux/product_logo_48_dev.png b/app/theme/brave/linux/product_logo_48_dev.png new file mode 100644 index 00000000000..3f689a0aef4 Binary files /dev/null and b/app/theme/brave/linux/product_logo_48_dev.png differ diff --git a/app/theme/brave/linux/product_logo_48_nightly.png b/app/theme/brave/linux/product_logo_48_nightly.png new file mode 100644 index 00000000000..786873f45ab Binary files /dev/null and b/app/theme/brave/linux/product_logo_48_nightly.png differ diff --git a/app/theme/brave/linux/product_logo_64.png b/app/theme/brave/linux/product_logo_64.png index c47d84049ef..3b240c939a7 100644 Binary files a/app/theme/brave/linux/product_logo_64.png and b/app/theme/brave/linux/product_logo_64.png differ diff --git a/app/theme/brave/linux/product_logo_64_beta.png b/app/theme/brave/linux/product_logo_64_beta.png new file mode 100644 index 00000000000..22945e9b6f6 Binary files /dev/null and b/app/theme/brave/linux/product_logo_64_beta.png differ diff --git a/app/theme/brave/linux/product_logo_64_dev.png b/app/theme/brave/linux/product_logo_64_dev.png new file mode 100644 index 00000000000..425857c947d Binary files /dev/null and b/app/theme/brave/linux/product_logo_64_dev.png differ diff --git a/app/theme/brave/linux/product_logo_64_nightly.png b/app/theme/brave/linux/product_logo_64_nightly.png new file mode 100644 index 00000000000..6e5c71867ca Binary files /dev/null and b/app/theme/brave/linux/product_logo_64_nightly.png differ diff --git a/app/theme/default_100_percent/brave/linux/product_logo_16.png b/app/theme/default_100_percent/brave/linux/product_logo_16.png index 5d5c80a2629..5dd7ab571cb 100644 Binary files a/app/theme/default_100_percent/brave/linux/product_logo_16.png and b/app/theme/default_100_percent/brave/linux/product_logo_16.png differ diff --git a/app/theme/default_100_percent/brave/linux/product_logo_16_beta.png b/app/theme/default_100_percent/brave/linux/product_logo_16_beta.png new file mode 100644 index 00000000000..cae405418bd Binary files /dev/null and b/app/theme/default_100_percent/brave/linux/product_logo_16_beta.png differ diff --git a/app/theme/default_100_percent/brave/linux/product_logo_16_dev.png b/app/theme/default_100_percent/brave/linux/product_logo_16_dev.png new file mode 100644 index 00000000000..c9076927157 Binary files /dev/null and b/app/theme/default_100_percent/brave/linux/product_logo_16_dev.png differ diff --git a/app/theme/default_100_percent/brave/linux/product_logo_16_nightly.png b/app/theme/default_100_percent/brave/linux/product_logo_16_nightly.png new file mode 100644 index 00000000000..cd3cf9a543e Binary files /dev/null and b/app/theme/default_100_percent/brave/linux/product_logo_16_nightly.png differ diff --git a/app/theme/default_100_percent/brave/linux/product_logo_32.png b/app/theme/default_100_percent/brave/linux/product_logo_32.png index 5805419484b..d5e7f1bae17 100644 Binary files a/app/theme/default_100_percent/brave/linux/product_logo_32.png and b/app/theme/default_100_percent/brave/linux/product_logo_32.png differ diff --git a/app/theme/default_100_percent/brave/linux/product_logo_32_beta.png b/app/theme/default_100_percent/brave/linux/product_logo_32_beta.png index f41baf34bf5..758948cd35f 100644 Binary files a/app/theme/default_100_percent/brave/linux/product_logo_32_beta.png and b/app/theme/default_100_percent/brave/linux/product_logo_32_beta.png differ diff --git a/app/theme/default_100_percent/brave/linux/product_logo_32_dev.png b/app/theme/default_100_percent/brave/linux/product_logo_32_dev.png index 9332e3d4f11..2182e8d582b 100644 Binary files a/app/theme/default_100_percent/brave/linux/product_logo_32_dev.png and b/app/theme/default_100_percent/brave/linux/product_logo_32_dev.png differ diff --git a/app/theme/default_100_percent/brave/linux/product_logo_32_nightly.png b/app/theme/default_100_percent/brave/linux/product_logo_32_nightly.png index 38c152802b8..93a2394adb8 100644 Binary files a/app/theme/default_100_percent/brave/linux/product_logo_32_nightly.png and b/app/theme/default_100_percent/brave/linux/product_logo_32_nightly.png differ