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

fix_move_autopipsettingshelper_behind_branding_buildflag.patch 4.1 KB
History Raw

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

  2. From: deepak1556 <[email protected]>
    3. 

  3. Date: Wed, 30 Aug 2023 15:56:53 +0900
    4. 

  4. Subject: fix: move AutoPipSettingsHelper behind branding buildflag
    5. 

  5. 

  6. The class was added in https://chromium-review.googlesource.com/c/chromium/src/+/4688277
    7. 

  7. which is primarily used for providing an overlay view in a PIP window
    8. 

  8. to support content settings UI. The support pulls in chrome content settings
    9. 

  9. and UI code which are not valid in the scope of Electron.
    10. 

  10. 

  11. diff --git a/chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc b/chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc
    12. 

  12. index 0a58771f77f9fab4bd660191a1b2c612f7951858..a25feb97dfa1f7f5c0378cdac256a8de542f3b7d 100644
    13. 

  13. --- a/chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc
    14. 

  14. +++ b/chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc
    15. 

  15. @@ -18,8 +18,10 @@
    16. 

  16.  #include "ui/gfx/geometry/size.h"
    17. 

  17.  #if !BUILDFLAG(IS_ANDROID)
    18. 

  18.  #include "base/task/sequenced_task_runner.h"
    19. 

  19. +#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    20. 

  20.  #include "chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.h"
    21. 

  21.  #include "chrome/browser/picture_in_picture/auto_pip_setting_helper.h"
    22. 

  22. +#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
    23. 

  23.  #include "third_party/blink/public/common/features.h"
    24. 

  24.  #include "ui/views/view.h"
    25. 

  25.  #endif  // !BUILDFLAG(IS_ANDROID)
    26. 

  26. @@ -288,7 +290,7 @@ void PictureInPictureWindowManager::CloseWindowInternal() {
    27. 

  27.    video_web_contents_observer_.reset();
    28. 

  28.    pip_window_controller_->Close(false /* should_pause_video */);
    29. 

  29.    pip_window_controller_ = nullptr;
    30. 

  30. -#if !BUILDFLAG(IS_ANDROID)
    31. 

  31. +#if !BUILDFLAG(IS_ANDROID) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
    32. 

  32.    auto_pip_setting_helper_.reset();
    33. 

  33.  #endif  // !BUILDFLAG(IS_ANDROID)
    34. 

  34.  }
    35. 

  35. @@ -299,8 +301,10 @@ void PictureInPictureWindowManager::DocumentWebContentsDestroyed() {
    36. 

  36.    // contents, so we only need to forget the controller here when user closes
    37. 

  37.    // the parent web contents with the PiP window open.
    38. 

  38.    document_web_contents_observer_.reset();
    39. 

  39. +#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    40. 

  40.    // `setting_helper_` depends on the opener's WebContents.
    41. 

  41.    auto_pip_setting_helper_.reset();
    42. 

  42. +#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
    43. 

  43.    if (pip_window_controller_)
    44. 

  44.      pip_window_controller_ = nullptr;
    45. 

  45.  }
    46. 

  46. @@ -318,6 +322,7 @@ std::unique_ptr<views::View> PictureInPictureWindowManager::GetOverlayView() {
    47. 

  47.      return nullptr;
    48. 

  48.    }
    49. 

  49.  
    50. 

  50. +#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    51. 

  51.    auto* const web_contents = pip_window_controller_->GetWebContents();
    52. 

  52.  
    53. 

  53.    auto* auto_pip_tab_helper =
    54. 

  54. @@ -339,6 +344,8 @@ std::unique_ptr<views::View> PictureInPictureWindowManager::GetOverlayView() {
    55. 

  55.    }
    56. 

  56.  
    57. 

  57.    return overlay_view;
    58. 

  58. +#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
    59. 

  59. +  return nullptr;
    60. 

  60.  }
    61. 

  61.  #endif  // !BUILDFLAG(IS_ANDROID)
    62. 

  62.  
    63. 

  63. diff --git a/chrome/browser/picture_in_picture/picture_in_picture_window_manager.h b/chrome/browser/picture_in_picture/picture_in_picture_window_manager.h
    64. 

  64. index 560f2901ef6860811c783c1eed9277223072aabf..f5a5e3d883e0186961bd5560b4429e19abf0df49 100644
    65. 

  65. --- a/chrome/browser/picture_in_picture/picture_in_picture_window_manager.h
    66. 

  66. +++ b/chrome/browser/picture_in_picture/picture_in_picture_window_manager.h
    67. 

  67. @@ -9,6 +9,7 @@
    68. 

  68.  #include "base/memory/singleton.h"
    69. 

  69.  #include "base/observer_list.h"
    70. 

  70.  #include "base/observer_list_types.h"
    71. 

  71. +#include "build/branding_buildflags.h"
    72. 

  72.  #include "build/build_config.h"
    73. 

  73.  #include "third_party/abseil-cpp/absl/types/optional.h"
    74. 

  74.  #include "third_party/blink/public/mojom/picture_in_picture_window_options/picture_in_picture_window_options.mojom.h"
    75. 

  75. @@ -25,7 +26,9 @@ class Display;
    76. 

  76.  }  // namespace display
    77. 

  77.  
    78. 

  78.  #if !BUILDFLAG(IS_ANDROID)
    79. 

  79. +#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    80. 

  80.  class AutoPipSettingHelper;
    81. 

  81. +#endif
    82. 

  82.  
    83. 

  83.  namespace views {
    84. 

  84.  class View;
    85. 

  85. @@ -193,7 +196,9 @@ class PictureInPictureWindowManager {
    86. 

  86.  #if !BUILDFLAG(IS_ANDROID)
    87. 

  87.    std::unique_ptr<DocumentWebContentsObserver> document_web_contents_observer_;
    88. 

  88.  
    89. 

  89. +#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    90. 

  90.    std::unique_ptr<AutoPipSettingHelper> auto_pip_setting_helper_;
    91. 

  91. +#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
    92. 

  92.  #endif  //! BUILDFLAG(IS_ANDROID)
    93. 

  93.  
    94. 

  94.    raw_ptr<content::PictureInPictureWindowController, DanglingUntriaged>
    95.