2019-08-22 10:17:50 +00:00
|
|
|
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
|
|
|
|
|
|
2019-12-13 17:18:45 +00:00
|
|
|
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.
|
2019-08-22 10:17:50 +00:00
|
|
|
|
|
|
|
|
diff --git a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
index 8c1466ff0b7862ac350fc981abc65f712bf577fc..de757dca84cdfd6a091193398d27b38db1ce0ff2 100644
|
2019-08-22 10:17:50 +00:00
|
|
|
--- a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
|
|
|
|
|
+++ b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
|
|
|
|
|
@@ -4,7 +4,7 @@
|
2019-09-18 19:58:00 +00:00
|
|
|
|
2019-08-22 10:17:50 +00:00
|
|
|
#include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
|
2019-09-18 19:58:00 +00:00
|
|
|
|
2019-08-22 10:17:50 +00:00
|
|
|
-#include "chrome/grit/generated_resources.h"
|
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
|
#include "third_party/skia/include/core/SkColor.h"
|
|
|
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
|
|
|
#include "ui/gfx/color_palette.h"
|
|
|
|
|
diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
index f35abd09439f96d997ddac672fb3b0ebeec0fd07..16e1c3d908ebce0c55a831299b64d1a7b9d43b1e 100644
|
2019-08-22 10:17:50 +00:00
|
|
|
--- a/chrome/browser/ui/views/overlay/close_image_button.cc
|
|
|
|
|
+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
|
|
|
|
|
@@ -4,7 +4,7 @@
|
2019-09-18 19:58:00 +00:00
|
|
|
|
2019-08-22 10:17:50 +00:00
|
|
|
#include "chrome/browser/ui/views/overlay/close_image_button.h"
|
2019-09-18 19:58:00 +00:00
|
|
|
|
2019-08-22 10:17:50 +00:00
|
|
|
-#include "chrome/grit/generated_resources.h"
|
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
|
#include "third_party/skia/include/core/SkColor.h"
|
|
|
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
|
|
|
#include "ui/gfx/color_palette.h"
|
|
|
|
|
diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
|
2020-10-28 00:33:04 +00:00
|
|
|
index f07d400f5830ca01a0a0cbc897de1be693e646ba..4b74e2301ab6627f954d661f4b327ab730a80cb1 100644
|
2019-08-22 10:17:50 +00:00
|
|
|
--- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
|
|
|
|
|
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -13,16 +13,18 @@
|
|
|
|
|
#include "base/timer/timer.h"
|
|
|
|
|
#include "build/build_config.h"
|
|
|
|
|
#include "chrome/app/vector_icons/vector_icons.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/views/overlay/back_to_tab_image_button.h"
|
|
|
|
|
#include "chrome/browser/ui/views/overlay/close_image_button.h"
|
|
|
|
|
#include "chrome/browser/ui/views/overlay/playback_image_button.h"
|
2019-08-22 10:17:50 +00:00
|
|
|
#include "chrome/browser/ui/views/overlay/resize_handle_button.h"
|
|
|
|
|
#include "chrome/browser/ui/views/overlay/skip_ad_label_button.h"
|
|
|
|
|
#include "chrome/browser/ui/views/overlay/track_image_button.h"
|
|
|
|
|
-#include "chrome/grit/generated_resources.h"
|
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
|
#include "components/vector_icons/vector_icons.h"
|
|
|
|
|
#include "content/public/browser/picture_in_picture_window_controller.h"
|
|
|
|
|
#include "content/public/browser/web_contents.h"
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -47,7 +49,7 @@
|
|
|
|
|
#include "ui/aura/window.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#if defined(OS_WIN)
|
|
|
|
|
+#if 0
|
|
|
|
|
#include "chrome/browser/shell_integration_win.h"
|
|
|
|
|
#include "ui/aura/window.h"
|
|
|
|
|
#include "ui/aura/window_tree_host.h"
|
|
|
|
|
@@ -218,7 +220,7 @@ std::unique_ptr<content::OverlayWindow> OverlayWindowViews::Create(
|
|
|
|
|
overlay_window->Init(std::move(params));
|
|
|
|
|
overlay_window->OnRootViewReady();
|
|
|
|
|
|
|
|
|
|
-#if defined(OS_WIN)
|
|
|
|
|
+#if 0
|
|
|
|
|
base::string16 app_user_model_id;
|
|
|
|
|
Browser* browser =
|
|
|
|
|
chrome::FindBrowserWithWebContents(controller->GetWebContents());
|
2019-08-22 10:17:50 +00:00
|
|
|
diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
index 5f90df7fc899e2ca47fce69ac109653f51587131..2c209a3d4a1f9a2aa3bfef85990ce36c9a565bb7 100644
|
2019-08-22 10:17:50 +00:00
|
|
|
--- a/chrome/browser/ui/views/overlay/playback_image_button.cc
|
|
|
|
|
+++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
|
|
|
|
|
@@ -5,7 +5,7 @@
|
|
|
|
|
#include "chrome/browser/ui/views/overlay/playback_image_button.h"
|
2019-09-18 19:58:00 +00:00
|
|
|
|
2019-08-22 10:17:50 +00:00
|
|
|
#include "chrome/app/vector_icons/vector_icons.h"
|
|
|
|
|
-#include "chrome/grit/generated_resources.h"
|
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
|
#include "components/vector_icons/vector_icons.h"
|
|
|
|
|
#include "third_party/skia/include/core/SkColor.h"
|
|
|
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
|
|
|
diff --git a/chrome/browser/ui/views/overlay/resize_handle_button.cc b/chrome/browser/ui/views/overlay/resize_handle_button.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
index 583900afa70e217f23ead999535bdebe674a25d5..f0cde61f3d95894281c13cc82a1d18405f6993c6 100644
|
2019-08-22 10:17:50 +00:00
|
|
|
--- a/chrome/browser/ui/views/overlay/resize_handle_button.cc
|
|
|
|
|
+++ b/chrome/browser/ui/views/overlay/resize_handle_button.cc
|
|
|
|
|
@@ -5,7 +5,7 @@
|
|
|
|
|
#include "chrome/browser/ui/views/overlay/resize_handle_button.h"
|
2019-09-18 19:58:00 +00:00
|
|
|
|
2019-08-22 10:17:50 +00:00
|
|
|
#include "chrome/app/vector_icons/vector_icons.h"
|
|
|
|
|
-#include "chrome/grit/generated_resources.h"
|
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
|
#include "third_party/skia/include/core/SkColor.h"
|
|
|
|
|
#include "ui/base/hit_test.h"
|
|
|
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
|
|
|
diff --git a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
index cda0a756c8c2934b166127b36f9618c194f6a80b..9f10712c37740b63828beac225e4d0d213cf5adf 100644
|
2019-08-22 10:17:50 +00:00
|
|
|
--- a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
|
|
|
|
|
+++ b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
|
|
|
|
|
@@ -4,7 +4,7 @@
|
2019-09-18 19:58:00 +00:00
|
|
|
|
2019-08-22 10:17:50 +00:00
|
|
|
#include "chrome/browser/ui/views/overlay/skip_ad_label_button.h"
|
2019-09-18 19:58:00 +00:00
|
|
|
|
2019-08-22 10:17:50 +00:00
|
|
|
-#include "chrome/grit/generated_resources.h"
|
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
|
|
|
#include "ui/gfx/color_palette.h"
|
|
|
|
|
#include "ui/views/background.h"
|
|
|
|
|
diff --git a/chrome/browser/ui/views/overlay/track_image_button.cc b/chrome/browser/ui/views/overlay/track_image_button.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
index 3390876fe53a68a814dc5adcfa5d76bdd126f6c5..fb1420d2c4ed67da0135df8ffb59ba1e03934e54 100644
|
2019-08-22 10:17:50 +00:00
|
|
|
--- a/chrome/browser/ui/views/overlay/track_image_button.cc
|
|
|
|
|
+++ b/chrome/browser/ui/views/overlay/track_image_button.cc
|
|
|
|
|
@@ -5,7 +5,7 @@
|
|
|
|
|
#include "chrome/browser/ui/views/overlay/track_image_button.h"
|
2019-09-18 19:58:00 +00:00
|
|
|
|
2019-08-22 10:17:50 +00:00
|
|
|
#include "chrome/app/vector_icons/vector_icons.h"
|
|
|
|
|
-#include "chrome/grit/generated_resources.h"
|
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
|
#include "components/vector_icons/vector_icons.h"
|
|
|
|
|
#include "third_party/skia/include/core/SkColor.h"
|
|
|
|
|
#include "ui/base/l10n/l10n_util.h"
|
