From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 5 Jul 2023 16:28:30 -0500 Subject: chore: add BUILDFLAG guard around new include Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4628373 This is an experimental commit; but if it's successful, This patch should be upstreamed and then removed from electron's code. diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 58f128d2217a07be876b0878d64ebf593ce6eb37..dedb231d21ead676fd0f568d3cebd3fb8ad2ed6d 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -43,7 +43,6 @@ #include "chrome/browser/ui/views/user_education/browser_feature_promo_controller.h" #include "chrome/common/buildflags.h" #include "components/infobars/core/infobar_container.h" -#include "components/segmentation_platform/public/result.h" #include "components/user_education/common/feature_promo_controller.h" #include "components/user_education/common/feature_promo_handle.h" #include "components/webapps/browser/banners/app_banner_manager.h" @@ -62,6 +61,10 @@ #include "ui/views/widget/widget_observer.h" #include "ui/views/window/client_view.h" +#if BUILDFLAG(GOOGLE_CHROME_BRANDING) +#include "components/segmentation_platform/public/result.h" +#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) + #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ui/compositor/throughput_tracker.h" #endif