72a089262e
* chore: bump chromium in DEPS to a7249f73ae05d456c04487ef1693325f719556dd * chore: bump chromium in DEPS to 202466fa40b58f0bb9c9a76a037d1c50154c099e * chore: bump chromium in DEPS to 2dd1b25c8d794b50fb0dd911e0c4e909ff39f145 * Update patches * update patches * Revert "[printing] Mojofy PrintHostMsg_CheckForCancel" https://chromium-review.googlesource.com/c/chromium/src/+/2226002 * chore: bump chromium in DEPS to 8c1542e7dd36854fdf4abd1a8021eeb65a6a2e2b * chore: bump chromium in DEPS to 078bc6d796334fb403acd8975b99d1c8ecd028e8 * chore: bump chromium in DEPS to d96e9f16ae852ec9dbd15bf17df3d440402413bb * update patches * chore: update patches * Use ExtensionSystem::is_ready() instead of ExtensionService::is_ready() https://chromium-review.googlesource.com/c/chromium/src/+/2207499 * Remove WebImeTextSpan https://chromium-review.googlesource.com/c/chromium/src/+/2225240 * Remove PDFAnnotations flag altogether. https://chromium-review.googlesource.com/c/chromium/src/+/2229317 * Rework find-from-selection so it's synchronous -- fixes flaky tests https://chromium-review.googlesource.com/c/chromium/src/+/2181570 * fixup! Revert "[printing] Mojofy PrintHostMsg_CheckForCancel" * chore: bump chromium in DEPS to a8a280835830c65145ed8573a9a09f36d3920418 * update sysroots * update patches * update patches * Take RFH as a parameter for DidUpdateFavicon/ManifestURL https://chromium-review.googlesource.com/c/chromium/src/+/2224745 * chore: bump chromium in DEPS to b6149cb5a5e32caf8eab67b97ef3072b72521ca8 * Update patches * Rename net::cookie_util::StripStatuses to StripAccessResults https://chromium-review.googlesource.com/c/chromium/src/+/2212697 * use net::CookieAccessResultList instead of net::CookieAccessResultList * fix mas_no_private_api patch https://chromium-review.googlesource.com/c/chromium/src/+/2230281 * chore: bump chromium in DEPS to a27feee1643d952e48f77c92d8c03aedea14b720 * update patches * fix: add new navigation state REUSE_SITE_INSTANCE To fix the new set of state checks added in https://chromium-review.googlesource.com/c/chromium/src/+/2215141 * chore: bump chromium in DEPS to ff4559a4c13d20888202474e4ab9917dbdad8a9a * update patches * Cleanup usages of old mojo types and remove unused code https://chromium-review.googlesource.com/c/chromium/src/+/2235699 * chore: bump chromium in DEPS to 05279845f76eb22900a8b0d1a11d4fd339a8e53b * chore: bump chromium in DEPS to 821558279767cffec90e3b5b947865f90089fed3 * chore: bump chromium in DEPS to 1aef04e6486be337d3dd820b2d64d6320a1b9c13 * chore: bump chromium in DEPS to dc86386e8fdd796a0f7577e91e42a7f8b7e9bc78 * chore: bump chromium in DEPS to 64f2360794f14643764092ba3e58e2ed8f9fee12 * chore: update patches * refactor: MessageLoop, you are terminated \o/ Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2246173 * refactor: plumb DownloadSchedule to DownloadItem Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2242202 * chore: fix variable typo in IPC * chore: s/BindPipeAndPassReceiver/BindNewPipeAndPassReceiver * chore: update patches * chore: XEvent becomes x11::Event Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2240355 * fixup! refactor: MessageLoop, you are terminated \o/ * fixup! chore: XEvent becomes x11::Event * build: update v8 headers * chore: fix windows build * chore: disable SameSite-by-default changes https://chromium-review.googlesource.com/c/chromium/src/+/2231445 * update printing.patch * chore: bump chromium DEPS to 9ae03ef8f7d4f6ac663f725bcfe70311987652f3 * Convert WidgetHostMsg_SelectionBoundsChanged/TextInputStateChanged https://chromium-review.googlesource.com/c/chromium/src/+/2243531 * chore: update v8 patches * [XProto] Replace usages of XID and ::Window with x11::Window https://chromium-review.googlesource.com/c/chromium/src/+/2249389 * Update VideoFrameMetadata to use base::Optionals https://chromium-review.googlesource.com/c/chromium/src/+/2231706 https://chromium-review.googlesource.com/c/chromium/src/+/2238361 * --disable-dev-shm-usage for gpu process crash * [v8] Allow for 4GB TypedArrays https://chromium-review.googlesource.com/c/v8/v8/+/2249668 * update lib_src_switch_buffer_kmaxlength_to_size_t.patch * disable app.getGPUInfo spec on linux * update patches Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
101 lines
5.3 KiB
Diff
101 lines
5.3 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/back_to_tab_image_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
|
|
index 8e4deafa1746eeb48802a0503fefb37bedb33d04..127c62efd2327e1f3f09e9b93a0b8344e2714f80 100644
|
|
--- 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 @@
|
|
|
|
#include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
|
|
|
|
-#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
|
|
index e9b64a823ae7e25361f37190d247af0fa6a6f68a..43fdb0ad50d2b11a1bc28aa0f358c6dd6feb72b8 100644
|
|
--- a/chrome/browser/ui/views/overlay/close_image_button.cc
|
|
+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
|
|
@@ -4,7 +4,7 @@
|
|
|
|
#include "chrome/browser/ui/views/overlay/close_image_button.h"
|
|
|
|
-#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
|
|
index 46cb8b1319cdd4baf729c86ecaafe418bb687921..fcb46c349abdb41e74c56b614d490b032949f332 100644
|
|
--- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
|
|
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
|
|
@@ -19,7 +19,7 @@
|
|
#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"
|
|
diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
|
|
index d9e5174ed622fb030bc37d32fbb40b132d7c4c23..1bf19c344721e74bb29c11a4c5c762a75e5cd821 100644
|
|
--- 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"
|
|
|
|
#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
|
|
index aeba6fba215677c2c54a40791986c464fa112486..ebcef6ab0b651c274aa530b1e8d25d3eebcf4f3f 100644
|
|
--- 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"
|
|
|
|
#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
|
|
index da780c96bb757d7382df5f419e2c0fd644ac72b0..ae520bcf73cf6c39ca428c03975746e20b23c3ee 100644
|
|
--- 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 @@
|
|
|
|
#include "chrome/browser/ui/views/overlay/skip_ad_label_button.h"
|
|
|
|
-#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
|
|
index 8f42277409a216f81d21723eb03045ac54525b0e..f7a15bfde9a43c15b18e8afbd60a0b19960f2c93 100644
|
|
--- 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"
|
|
|
|
#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"
|