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-11-14 00:16:56 +00:00
|
|
|
index 664500224b99779388b5fabfface02a9ff599fdc..2be06a3e1934a73b9825953a3b897f5bc0f12540 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-11-14 00:16:56 +00:00
|
|
|
index 7bc1f27c0d2c181aa365e8b7b71877969567a8b0..6a43456834fa62df17419153d25474892088b559 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-11-14 00:16:56 +00:00
|
|
|
index 36261d8e71b00aadbecc4d5e7c5d0568742481f4..13f4f6b451cd73e67792a5d8750a89af483b2d12 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-11-14 00:16:56 +00:00
|
|
|
index b1272d8664afdd5c05afcb38a2f533741f210554..20f7ffa8be09b046122430c4497edce807f5d69f 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-11-14 00:16:56 +00:00
|
|
|
index 251503cb7154c77333d85be892fe89253523a94a..052e74bb54e8b32985af7b5f870159c80ca44d87 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-11-14 00:16:56 +00:00
|
|
|
index d5fe4187200354d18c778591e2383d9c23f4783f..ccb0ed6fef88b7ec228055ded708637c3e094571 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"
|
