mirror of
https://github.com/electron/electron.git
synced 2026-01-07 22:54:25 -05:00
* chore: bump chromium in DEPS to 141.0.7381.3 * chore: update patches * chore: bump chromium in DEPS to 141.0.7382.0 * chore: update patches * chore: bump chromium in DEPS to 141.0.7384.0 * chore: bump chromium in DEPS to 141.0.7386.0 * [Extensions] Move devtools_page and chrome_url_overrides handlers Refs https://chromium-review.googlesource.com/c/chromium/src/+/6862700 * Reland "[api] Advance deprecation of GetIsolate" Refs https://chromium-review.googlesource.com/c/v8/v8/+/6875273 * Move "system integrated UI" concept out of NativeTheme. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6867375 * chore: update patches * Reland "[PermissionOptions] Return PermissionResult in callback for requests" Refs https://chromium-review.googlesource.com/c/chromium/src/+/6851838 * Reland "[exit-time-destructors] Enable by default" Refs https://chromium-review.googlesource.com/c/chromium/src/+/6859042 * chore: update patches * [FSA] Revoke Read access after removing file via FileSystemAccess API Refs https://chromium-review.googlesource.com/c/chromium/src/+/6677249 * chore: IWYU * [DevToolsUIBindings] Accept an object for `dispatchHttpRequest` params Refs https://chromium-review.googlesource.com/c/chromium/src/+/6877528 * chore: IWYU * Pass navigation UI parameters on EnterFullscreen in EAM Refs https://chromium-review.googlesource.com/c/chromium/src/+/6874923 * chore: rm band-aid_over_an_issue_with_using_deprecated_nsopenpanel_api.patch * Remove unused PreHandleMouseEvent Refs https://chromium-review.googlesource.com/c/chromium/src/+/6880411 * 6878583: siso: update to version 1.4.1 https://chromium-review.googlesource.com/c/chromium/src/+/6878583 * Fold native_theme_browser into native_theme. https://chromium-review.googlesource.com/c/chromium/src/+/6882627 * fixup: Reland "[exit-time-destructors] Enable by default https://chromium-review.googlesource.com/c/chromium/src/+/6859042 * chore: update filenames.libcxx.gni * chore: IWYU * fixup: chore: IWYU * fixup: Reland "[exit-time-destructors] Enable by default * fixup: Reland "[exit-time-destructors] Enable by default * Remove common_theme.*; place its method in NativeTheme instead. https://chromium-review.googlesource.com/c/chromium/src/+/6886029 * fixup: Reland "[exit-time-destructors] Enable by default * Better track when WebPreferences need updates for color-related changes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6886797 * chore: bump chromium in DEPS to 141.0.7390.7 * 6904664: Reland "Make BrowserContext::GetPath() const" https://chromium-review.googlesource.com/c/chromium/src/+/6904664 * Restore read access after certain file modification operations https://chromium-review.googlesource.com/c/chromium/src/+/6861041 * fixup: Move "system integrated UI" concept out of NativeTheme. * fixup: Reland "[exit-time-destructors] Enable by default * chore: update patches * 6906096: Remove GetSysSkColor(). https://chromium-review.googlesource.com/c/chromium/src/+/6906096 * Inline implementation of SysColorChangeListener into the lone user. https://chromium-review.googlesource.com/c/chromium/src/+/6905083 Also 6906096: Remove GetSysSkColor(). | https://chromium-review.googlesource.com/c/chromium/src/+/6906096 * fixup: 6906096: Remove GetSysSkColor() --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
110 lines
4.8 KiB
Diff
110 lines
4.8 KiB
Diff
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 fcb7d2c18f39acb174fc456362de51c484de398c..fea71317b41429dd3bbd50947673124f7c230394 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) {
|
|
@@ -1270,11 +1274,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) {
|
|
@@ -2561,6 +2567,7 @@ gfx::Rect VideoOverlayWindowViews::GetLiveCaptionDialogBounds() {
|
|
|
|
bool VideoOverlayWindowViews::HasHighMediaEngagement(
|
|
const url::Origin& origin) const {
|
|
+#if 0
|
|
MediaEngagementService* service =
|
|
MediaEngagementService::Get(Profile::FromBrowserContext(
|
|
GetController()->GetWebContents()->GetBrowserContext()));
|
|
@@ -2569,6 +2576,8 @@ bool VideoOverlayWindowViews::HasHighMediaEngagement(
|
|
}
|
|
|
|
return service->HasHighEngagement(origin);
|
|
+#endif
|
|
+ return true;
|
|
}
|
|
|
|
bool VideoOverlayWindowViews::IsTrustedForMediaPlayback() const {
|