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
|
|
|
|
2023-09-06 01:17:56 +00:00
|
|
|
diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
|
|
|
|
|
index af0616d9ca466d146f3c41887857dd4720ebafbf..c088db193f5bd4b88aa42a3803571d2b87251b76 100644
|
|
|
|
|
--- a/chrome/browser/ui/views/overlay/close_image_button.cc
|
|
|
|
|
+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
|
|
|
|
|
@@ -4,11 +4,14 @@
|
|
|
|
|
|
|
|
|
|
#include "chrome/browser/ui/views/overlay/close_image_button.h"
|
|
|
|
|
|
|
|
|
|
+#include "build/branding_buildflags.h"
|
|
|
|
|
#include "build/chromeos_buildflags.h"
|
|
|
|
|
#include "chrome/browser/ui/color/chrome_color_id.h"
|
|
|
|
|
#include "chrome/grit/generated_resources.h"
|
|
|
|
|
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
|
|
|
#include "components/omnibox/browser/omnibox_field_trial.h"
|
|
|
|
|
#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,9 +31,11 @@ CloseImageButton::CloseImageButton(PressedCallback callback)
|
|
|
|
|
SetSize(gfx::Size(kCloseButtonSize, kCloseButtonSize));
|
|
|
|
|
|
|
|
|
|
auto* icon = &views::kIcCloseIcon;
|
|
|
|
|
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
|
|
|
if (OmniboxFieldTrial::IsChromeRefreshIconsEnabled()) {
|
|
|
|
|
icon = &vector_icons::kCloseChromeRefreshIcon;
|
|
|
|
|
}
|
|
|
|
|
+#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
|
|
|
SetImageModel(views::Button::STATE_NORMAL,
|
|
|
|
|
ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
|
|
|
|
|
kCloseButtonIconSize));
|
2022-02-25 18:17:35 +00:00
|
|
|
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
2023-09-29 05:26:41 +00:00
|
|
|
index 692ce6c73512c096f37209ab9f27d44d73296d57..b425171629ad6c8b43c6b429f07ac7c96806e2da 100644
|
2022-02-25 18:17:35 +00:00
|
|
|
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
|
|
|
|
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
2023-09-18 20:44:09 +00:00
|
|
|
@@ -16,9 +16,11 @@
|
2022-02-25 18:17:35 +00:00
|
|
|
#include "base/timer/timer.h"
|
|
|
|
|
#include "build/build_config.h"
|
2023-09-18 20:44:09 +00:00
|
|
|
#include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h"
|
2022-02-25 18:17:35 +00:00
|
|
|
+#if 0
|
|
|
|
|
#include "chrome/browser/profiles/profile.h"
|
|
|
|
|
#include "chrome/browser/ui/browser.h"
|
|
|
|
|
#include "chrome/browser/ui/browser_finder.h"
|
|
|
|
|
+#endif
|
2022-03-25 01:39:03 +00:00
|
|
|
#include "chrome/browser/ui/color/chrome_color_id.h"
|
2022-02-25 18:17:35 +00:00
|
|
|
#include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
|
2022-12-05 22:59:19 +00:00
|
|
|
#include "chrome/browser/ui/views/overlay/close_image_button.h"
|
2023-09-18 20:44:09 +00:00
|
|
|
@@ -55,7 +57,7 @@
|
2022-02-25 18:17:35 +00:00
|
|
|
#include "ui/aura/window.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
|
|
|
+#if 0
|
|
|
|
|
#include "chrome/browser/shell_integration_win.h"
|
|
|
|
|
#include "ui/aura/window.h"
|
|
|
|
|
#include "ui/aura/window_tree_host.h"
|
2023-09-29 05:26:41 +00:00
|
|
|
@@ -276,7 +278,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
|
2022-02-25 18:17:35 +00:00
|
|
|
overlay_window->Init(std::move(params));
|
|
|
|
|
overlay_window->OnRootViewReady();
|
|
|
|
|
|
|
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
|
|
|
+#if 0
|
|
|
|
|
std::wstring app_user_model_id;
|
|
|
|
|
Browser* browser =
|
|
|
|
|
chrome::FindBrowserWithWebContents(controller->GetWebContents());
|
