From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Heilig Benedek <benecene@gmail.com>
Date: Sat, 10 Aug 2019 00:41:50 +0200
Subject: feat: enable picture in picture mode for video players

These files are needed to implement PiP, but the Electron build patches out
chrome's generated resources for our own. This updates the #include so that we
don't get errors for Chrome's generated resources, which are non-existent
because we don't generate them in our build.

diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
index 85df555841ac0d32d2f097547c9991cecf0f4b1a..7a108339448fad3105e87c9d9af678c2f85b8ed5 100644
--- a/chrome/browser/ui/views/overlay/close_image_button.cc
+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
@@ -5,9 +5,12 @@
 #include "chrome/browser/ui/views/overlay/close_image_button.h"
 
 #include "base/feature_list.h"
+#include "build/branding_buildflags.h"
 #include "chrome/browser/ui/color/chrome_color_id.h"
 #include "chrome/grit/generated_resources.h"
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
 #include "components/vector_icons/vector_icons.h"
+#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/models/image_model.h"
@@ -28,7 +31,10 @@ CloseImageButton::CloseImageButton(PressedCallback callback)
     : OverlayWindowImageButton(std::move(callback)) {
   SetSize(gfx::Size(kCloseButtonSize, kCloseButtonSize));
 
-  auto* icon = &vector_icons::kCloseChromeRefreshIcon;
+  auto* icon = &views::kIcCloseIcon;
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+  icon = &vector_icons::kCloseChromeRefreshIcon;
+#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
   SetImageModel(views::Button::STATE_NORMAL,
                 ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
                                                kCloseButtonIconSize));
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
index d54cc1a443e3b2d869dc148f532b3138a6d02d29..117b6b94f54f7629b5233cfdf988608476e7321c 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -18,12 +18,16 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
+#if 0
 #include "chrome/browser/media/media_engagement_service.h"
+#endif
 #include "chrome/browser/picture_in_picture/picture_in_picture_occlusion_tracker.h"
 #include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h"
+#if 0
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
+#endif
 #include "chrome/browser/ui/color/chrome_color_id.h"
 #include "chrome/browser/ui/views/overlay/back_to_tab_button.h"
 #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
@@ -79,7 +83,7 @@
 #include "ui/aura/window.h"
 #endif
 
-#if BUILDFLAG(IS_WIN)
+#if 0
 #include "chrome/browser/shell_integration_win.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "ui/aura/window.h"
@@ -434,7 +438,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
   overlay_window->Init(std::move(params));
   overlay_window->OnRootViewReady();
 
-#if BUILDFLAG(IS_WIN)
+#if 0
   std::wstring app_user_model_id;
   Browser* browser = chrome::FindBrowserWithTab(controller->GetWebContents());
   if (browser) {
@@ -1271,11 +1275,13 @@ void VideoOverlayWindowViews::SetUpViews() {
             &VideoOverlayWindowViews::OnLiveCaptionButtonPressed,
             base::Unretained(this)));
     live_caption_button->SetSize(kActionButtonSize);
+#if 0
     live_caption_button->SetIsLiveCaptionDialogOpen(false);
     live_caption_dialog = std::make_unique<OverlayWindowLiveCaptionDialog>(
         Profile::FromBrowserContext(
             controller_->GetWebContents()->GetBrowserContext()));
     live_caption_dialog->SetVisible(false);
+#endif
     toggle_microphone_button =
         std::make_unique<ToggleMicrophoneButton>(base::BindRepeating(
             [](VideoOverlayWindowViews* overlay) {
@@ -2412,9 +2418,10 @@ void VideoOverlayWindowViews::OnGestureEvent(ui::GestureEvent* event) {
       event->SetHandled();
       return;
     }
-
+#if 0
     // Otherwise, let the live caption dialog handle the gesture.
     live_caption_dialog_->OnGestureTapEvent(event);
+#endif
     return;
   }
 
@@ -2573,6 +2580,7 @@ gfx::Rect VideoOverlayWindowViews::GetLiveCaptionDialogBounds() {
 
 bool VideoOverlayWindowViews::HasHighMediaEngagement(
     const url::Origin& origin) const {
+#if 0
   MediaEngagementService* service =
       MediaEngagementService::Get(Profile::FromBrowserContext(
           GetController()->GetWebContents()->GetBrowserContext()));
@@ -2581,6 +2589,8 @@ bool VideoOverlayWindowViews::HasHighMediaEngagement(
   }
 
   return service->HasHighEngagement(origin);
+#endif
+  return true;
 }
 
 bool VideoOverlayWindowViews::IsTrustedForMediaPlayback() const {