Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: e72f4f7f26
Branches Tags
electron
/
patches
/
chromium
/
chore_add_buildflag_guard_around_new_include.patch

chore_add_buildflag_guard_around_new_include.patch 1.5 KB
History Raw

123456789101112131415161718192021222324252627282930313233 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Charles Kerr <[email protected]>
    3. 

  3. Date: Wed, 5 Jul 2023 16:28:30 -0500
    4. 

  4. Subject: chore: add BUILDFLAG guard around new include
    5. 

  5. 

  6. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4628373
    7. 

  7. 

  8. This is an experimental commit; but if it's successful,
    9. 

  9. This patch should be upstreamed and then removed from electron's code.
    10. 

  10. 

  11. diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
    12. 

  12. index 88686b784dac3d28d1f51e1fac3783f5c8ea9347..7eb898f37d2f7a75be316ea2f2bd6ef229a44ed3 100644
    13. 

  13. --- a/chrome/browser/ui/views/frame/browser_view.h
    14. 

  14. +++ b/chrome/browser/ui/views/frame/browser_view.h
    15. 

  15. @@ -42,7 +42,6 @@
    16. 

  16.  #include "chrome/browser/ui/views/user_education/browser_feature_promo_controller.h"
    17. 

  17.  #include "chrome/common/buildflags.h"
    18. 

  18.  #include "components/infobars/core/infobar_container.h"
    19. 

  19. -#include "components/segmentation_platform/public/result.h"
    20. 

  20.  #include "components/user_education/common/feature_promo_controller.h"
    21. 

  21.  #include "components/user_education/common/feature_promo_handle.h"
    22. 

  22.  #include "components/webapps/browser/banners/app_banner_manager.h"
    23. 

  23. @@ -62,6 +61,10 @@
    24. 

  24.  #include "ui/views/widget/widget_observer.h"
    25. 

  25.  #include "ui/views/window/client_view.h"
    26. 

  26.  
    27. 

  27. +#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    28. 

  28. +#include "components/segmentation_platform/public/result.h"
    29. 

  29. +#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
    30. 

  30. +
    31. 

  31.  #if BUILDFLAG(IS_CHROMEOS_ASH)
    32. 

  32.  #include "ui/compositor/throughput_tracker.h"
    33. 

  33.  #endif
    34.