From 9b2b1998b8386aa324ed617ed2cc23df742eb767 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Mon, 22 Aug 2022 07:38:45 -0700 Subject: [PATCH] fix: ensure chrome colors are initialized (#35034) * fix: ensure chrome colors are initialized * build: fix linking on windows * build: fix linking on windows * build: add needed files to chromium_src/BUILD Co-authored-by: VerteDinde --- chromium_src/BUILD.gn | 15 +++++++++++++++ shell/browser/electron_browser_main_parts.cc | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn index bfd971e576a8..2ec068f21e80 100644 --- a/chromium_src/BUILD.gn +++ b/chromium_src/BUILD.gn @@ -55,6 +55,14 @@ static_library("chrome") { "//chrome/browser/process_singleton.h", "//chrome/browser/process_singleton_internal.cc", "//chrome/browser/process_singleton_internal.h", + "//chrome/browser/themes/browser_theme_pack.cc", + "//chrome/browser/themes/browser_theme_pack.h", + "//chrome/browser/themes/custom_theme_supplier.cc", + "//chrome/browser/themes/custom_theme_supplier.h", + "//chrome/browser/themes/theme_properties.cc", + "//chrome/browser/themes/theme_properties.h", + "//chrome/browser/ui/color/chrome_color_mixers.cc", + "//chrome/browser/ui/color/chrome_color_mixers.h", "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc", "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h", "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc", @@ -69,7 +77,11 @@ static_library("chrome") { "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h", "//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc", "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h", + "//chrome/browser/ui/frame/window_frame_util.cc", + "//chrome/browser/ui/frame/window_frame_util.h", "//chrome/browser/ui/native_window_tracker.h", + "//chrome/browser/ui/ui_features.cc", + "//chrome/browser/ui/ui_features.h", "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc", "//chrome/browser/ui/views/eye_dropper/eye_dropper.h", "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc", @@ -110,6 +122,8 @@ static_library("chrome") { "//chrome/browser/ui/view_ids.h", "//chrome/browser/win/chrome_process_finder.cc", "//chrome/browser/win/chrome_process_finder.h", + "//chrome/browser/win/titlebar_config.cc", + "//chrome/browser/win/titlebar_config.h", "//chrome/browser/win/titlebar_config.h", "//chrome/child/v8_crashpad_support_win.cc", "//chrome/child/v8_crashpad_support_win.h", @@ -131,6 +145,7 @@ static_library("chrome") { public_deps = [ "//chrome/browser:dev_ui_browser_resources", + "//chrome/browser/ui/color:mixers", "//chrome/common", "//chrome/common:version_header", "//components/keyed_service/content", diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc index c8f9faf592ed..046752918d45 100644 --- a/shell/browser/electron_browser_main_parts.cc +++ b/shell/browser/electron_browser_main_parts.cc @@ -17,6 +17,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/icon_manager.h" +#include "chrome/browser/ui/color/chrome_color_mixers.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "components/os_crypt/key_storage_config_linux.h" @@ -225,6 +226,9 @@ int ElectronBrowserMainParts::PreEarlyInitialization() { screen_ = std::make_unique(); #endif + ui::ColorProviderManager::Get().AppendColorProviderInitializer( + base::BindRepeating(AddChromeColorMixers)); + return GetExitCode(); }