Skip to content

Commit 6f6fff5

Browse files
nornagonnornagon
committed
update patches
1 parent dfbcf8d commit 6f6fff5

17 files changed

+176
-156
lines changed

‎patches/chromium/blink_local_frame.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Refs changes in:
1515
This patch reverts the changes to fix associated crashes in Electron.
1616

1717
diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
18-
index 0a742bbbd5e8e1eb3610cc32f785f779e8907e75..26967019244d409dadf4533405d4d5d27c75b73c 100644
18+
index 0e21d9c3194198e7540c7b3a84e8aed691821cbb..c0f5d92f8613ca380295cca7f55456d6fbcd6d1f 100644
1919
--- a/third_party/blink/renderer/core/frame/frame.cc
2020
+++ b/third_party/blink/renderer/core/frame/frame.cc
2121
@@ -125,14 +125,6 @@ bool Frame::Detach(FrameDetachType type) {

‎patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ index c13bf8667c6996ec8ad4a3149993b266cea446bf..da2704e283bbaad9110ca57fb5bef786
3333
"//base",
3434
"//build:branding_buildflags",
3535
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
36-
index 3d63a3ec448750356e5dbd500e89c6a515d2bc0a..a1132b35b7fd015eacd7e3bef17a89361acd94f8 100644
36+
index c9ff70a8f2f718de759c1c5c6d6b598ecd62a695..422d2127bf7c73ba3fda37e1268c09934e2e6773 100644
3737
--- a/chrome/browser/BUILD.gn
3838
+++ b/chrome/browser/BUILD.gn
39-
@@ -4919,7 +4919,7 @@ static_library("browser") {
39+
@@ -4921,7 +4921,7 @@ static_library("browser") {
4040

4141
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
4242
# than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 3d63a3ec448750356e5dbd500e89c6a515d2bc0a..a1132b35b7fd015eacd7e3bef17a8936
4646
sources += [ "certificate_viewer_stub.cc" ]
4747
}
4848
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
49-
index 39afd0c6f9f94c48e15c024079f34933f8461ca0..869e7d7c5fff8b80952a14bab1ce38b99ce4a9b8 100644
49+
index 415c81d75610d326fb51f38a5fda9de33f99f72e..6526efc533498e51a28947a2c59dfffac4e92191 100644
5050
--- a/chrome/test/BUILD.gn
5151
+++ b/chrome/test/BUILD.gn
52-
@@ -7308,9 +7308,12 @@ test("unit_tests") {
52+
@@ -7318,9 +7318,12 @@ test("unit_tests") {
5353
"//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
5454
]
5555

@@ -63,7 +63,7 @@ index 39afd0c6f9f94c48e15c024079f34933f8461ca0..869e7d7c5fff8b80952a14bab1ce38b9
6363
"//chrome//services/util_win:unit_tests",
6464
"//chrome/app:chrome_dll_resources",
6565
"//chrome/app:win_unit_tests",
66-
@@ -8308,6 +8311,10 @@ test("unit_tests") {
66+
@@ -8319,6 +8322,10 @@ test("unit_tests") {
6767
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
6868
]
6969

@@ -74,7 +74,7 @@ index 39afd0c6f9f94c48e15c024079f34933f8461ca0..869e7d7c5fff8b80952a14bab1ce38b9
7474
sources += [
7575
# The importer code is not used on Android.
7676
"../common/importer/firefox_importer_utils_unittest.cc",
77-
@@ -8384,7 +8391,6 @@ test("unit_tests") {
77+
@@ -8395,7 +8402,6 @@ test("unit_tests") {
7878
}
7979

8080
deps += [

‎patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ index 28cd699814f32a7a569d63936b9544567a66d9c4..fd461fa448d983481dc4c0c7d03b1945
8080
}
8181

8282
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
83-
index 01a2f84595514eea61b3328ae911c9300f85d31a..08b27a2a1e0af9ca1f1bb562de548e524310ffdf 100644
83+
index a1d50c2e470564578413c79b90d4f0493bd77e4f..3cd7799304c4e47e539973376d979e3b10ca968c 100644
8484
--- a/chrome/browser/ui/browser.cc
8585
+++ b/chrome/browser/ui/browser.cc
86-
@@ -1971,12 +1971,11 @@ bool Browser::IsWebContentsCreationOverridden(
86+
@@ -1978,12 +1978,11 @@ bool Browser::IsWebContentsCreationOverridden(
8787
content::SiteInstance* source_site_instance,
8888
content::mojom::WindowContainerType window_container_type,
8989
const GURL& opener_url,
@@ -99,10 +99,10 @@ index 01a2f84595514eea61b3328ae911c9300f85d31a..08b27a2a1e0af9ca1f1bb562de548e52
9999

100100
WebContents* Browser::CreateCustomWebContents(
101101
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
102-
index 4b2647bd47862f0dc75bc72f0b09dc5ad70d04a8..c23e2b182c18038711959c6ddf0ac137859f95f9 100644
102+
index af562dfe079090a2f9cbcdfa4bbd9ee7a3bb38f0..171dd773a6ba004eda9392efbd4eecd8bae90efb 100644
103103
--- a/chrome/browser/ui/browser.h
104104
+++ b/chrome/browser/ui/browser.h
105-
@@ -960,8 +960,7 @@ class Browser : public TabStripModelObserver,
105+
@@ -961,8 +961,7 @@ class Browser : public TabStripModelObserver,
106106
content::SiteInstance* source_site_instance,
107107
content::mojom::WindowContainerType window_container_type,
108108
const GURL& opener_url,

‎patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This
77
to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.
88

99
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
10-
index 3ee750502ed8b58fc04e6fa89fe3916341f7362e..a8c99a1afe2ea100a6dd98797e7505bf9070c8e0 100644
10+
index 98de040583e1148fbadd6e666006164156515bb9..5fe52240c556c9eb3163330f1d22585a5fdff5be 100644
1111
--- a/content/app/content_main_runner_impl.cc
1212
+++ b/content/app/content_main_runner_impl.cc
1313
@@ -40,6 +40,7 @@
@@ -102,10 +102,10 @@ index 2b0919b9a56bd37a398109777dfd199d777a9f74..823f44ab0303ccd6c7502ec65560ddb5
102102
friend class ContentClientCreator;
103103
friend class ContentClientInitializer;
104104
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
105-
index ef90742c78529a883a12c582c5950a7511cf5de0..900d45483b9df3d45633497daf82fbebbb764c68 100644
105+
index ee73fad76593c8af5c8cef2ec1da56a77933e113..eb94184ab6cad33075093028581c2122d5e467d4 100644
106106
--- a/gin/v8_initializer.cc
107107
+++ b/gin/v8_initializer.cc
108-
@@ -592,8 +592,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
108+
@@ -584,8 +584,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
109109

110110
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
111111

@@ -115,7 +115,7 @@ index ef90742c78529a883a12c582c5950a7511cf5de0..900d45483b9df3d45633497daf82fbeb
115115
if (g_mapped_snapshot) {
116116
// TODO(crbug.com/40558459): Confirm not loading different type of snapshot
117117
// files in a process.
118-
@@ -602,10 +601,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
118+
@@ -594,10 +593,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
119119

120120
base::MemoryMappedFile::Region file_region;
121121
base::File file =

‎patches/chromium/feat_allow_code_cache_in_custom_schemes.patch

+8-10
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,12 @@ index 8fc176cfd3a0411521c0f5e4f60b70ca333f60c8..e43f09d80bc9472a027bb11325803aab
5454
- DCHECK(resource_url.SchemeIsHTTPOrHTTPS() ||
5555
- resource_url_is_chrome_or_chrome_untrusted ||
5656
- blink::CommonSchemeRegistry::IsExtensionScheme(resource_url.scheme()));
57-
-
57+
5858
- // |origin_lock| should be either empty or should have
5959
- // Http/Https/chrome/chrome-untrusted schemes and it should not be a URL with
6060
- // opaque origin. Empty origin_locks are allowed when the renderer is not
6161
- // locked to an origin.
6262
- bool origin_lock_is_chrome_or_chrome_untrusted =
63-
+
6463
+ const bool resource_url_embedder =
6564
+ base::Contains(url::GetCodeCacheSchemes(), resource_url.scheme());
6665
+ DCHECK(resource_url_http || resource_url_webui || resource_url_embedder);
@@ -81,16 +80,15 @@ index 8fc176cfd3a0411521c0f5e4f60b70ca333f60c8..e43f09d80bc9472a027bb11325803aab
8180
- origin_lock_is_chrome_or_chrome_untrusted ||
8281
- blink::CommonSchemeRegistry::IsExtensionScheme(origin_lock.scheme())) &&
8382
- !url::Origin::Create(origin_lock).opaque()));
84-
-
83+
+ const bool origin_lock_for_embedder =
84+
+ base::Contains(url::GetCodeCacheSchemes(), origin_lock.scheme());
85+
8586
- // The chrome and chrome-untrusted schemes are only used with the WebUI
8687
- // code cache type.
8788
- DCHECK_EQ(origin_lock_is_chrome_or_chrome_untrusted,
8889
- cache_type == GeneratedCodeCache::kWebUIJavaScript);
8990
- DCHECK_EQ(resource_url_is_chrome_or_chrome_untrusted,
9091
- cache_type == GeneratedCodeCache::kWebUIJavaScript);
91-
+ const bool origin_lock_for_embedder =
92-
+ base::Contains(url::GetCodeCacheSchemes(), origin_lock.scheme());
93-
+
9492
+ DCHECK(origin_lock_empty || ((origin_lock_for_http || origin_lock_for_webui ||
9593
+ origin_lock_for_embedder) &&
9694
+ !url::Origin::Create(origin_lock).opaque()));
@@ -407,11 +405,11 @@ index 9dc2d5a33858da7c31fd87bbbabe3899301fa52d..ebf0bb23b9aedb7bf9eb8af52b4756db
407405
std::vector<std::string> extension_schemes;
408406
// Registers a URL scheme with a predefined default custom handler.
409407
diff --git a/url/url_util.cc b/url/url_util.cc
410-
index fd6de92945bf1a98700fdf5fc83872180b628b62..f98ed81866daf40943d83fdab4c0d95d617885b8 100644
408+
index 3191f87472acd7b2356f59b132803befa2561cdf..638ce775ecfbef3a3bb20a5224711f37903266a4 100644
411409
--- a/url/url_util.cc
412410
+++ b/url/url_util.cc
413-
@@ -116,6 +116,9 @@ struct SchemeRegistry {
414-
kAboutScheme,
411+
@@ -123,6 +123,9 @@ struct SchemeRegistry {
412+
kAndroidScheme,
415413
};
416414

417415
+ // Embedder schemes that have V8 code cache enabled in js and wasm scripts.
@@ -420,7 +418,7 @@ index fd6de92945bf1a98700fdf5fc83872180b628b62..f98ed81866daf40943d83fdab4c0d95d
420418
// Schemes with a predefined default custom handler.
421419
std::vector<SchemeWithHandler> predefined_handler_schemes;
422420

423-
@@ -683,6 +686,15 @@ const std::vector<std::string>& GetEmptyDocumentSchemes() {
421+
@@ -704,6 +707,15 @@ const std::vector<std::string>& GetEmptyDocumentSchemes() {
424422
return GetSchemeRegistry().empty_document_schemes;
425423
}
426424

‎patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ index ceced82cbd23b2dcd7fabf7d63028423f86e05c3..27d0b61a7b67d1c9d7e0699e287b7833
7575

7676
PictureInPictureOcclusionTracker*
7777
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
78-
index 28d3689be10469fa9f6bd8e608717c4d13a92620..9497277742369bfc53d14462ab354c31799b967e 100644
78+
index ecabd4e26fa4eca960cdd890d6b174d1505471a7..9224005d825ce4095c47c367b45a5de1569e2aca 100644
7979
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
8080
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
81-
@@ -343,11 +343,13 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
81+
@@ -344,11 +344,13 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
8282
input_scope);
8383
#endif // BUILDFLAG(IS_WIN)
8484

‎patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ index fa65331f40b90d812b71a489fd560e9359152d2b..390714d631dc88ef92d59ef9618a5706
204204
const mojom::blink::UserActivationOption user_activation_option_;
205205
const mojom::blink::LoadEventBlockingOption blocking_option_;
206206
diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc
207-
index 161ed4eebbe8a70f454b090e91b820fb0e735a90..362362f463ea5868a7fc4a300cca800cfe8d1e5a 100644
207+
index 0fc6dddb724333c6f948b724c1d5fd68f0c3b8d6..12fc1ff9c6bd5809b1197886e1a2bf7eda64ec36 100644
208208
--- a/third_party/blink/renderer/core/frame/web_frame_test.cc
209209
+++ b/third_party/blink/renderer/core/frame/web_frame_test.cc
210210
@@ -289,6 +289,7 @@ void ExecuteScriptsInMainWorld(
@@ -216,10 +216,10 @@ index 161ed4eebbe8a70f454b090e91b820fb0e735a90..362362f463ea5868a7fc4a300cca800c
216216
mojom::blink::WantResultOption::kWantResult, wait_for_promise);
217217
}
218218
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
219-
index 236e713bf25da95c67f18b2c7102ed14dd3b0abe..26d9c24d30c903f842b2f63d7f88d1b579e20f97 100644
219+
index 2af87b7d7dcebf7a682cd55a771e152c9390f0ef..c5e01a6e09e2b3d9bafa3df2e7359e64a27917fe 100644
220220
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
221221
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
222-
@@ -1095,14 +1095,15 @@ void WebLocalFrameImpl::RequestExecuteScript(
222+
@@ -1089,14 +1089,15 @@ void WebLocalFrameImpl::RequestExecuteScript(
223223
mojom::blink::EvaluationTiming evaluation_timing,
224224
mojom::blink::LoadEventBlockingOption blocking_option,
225225
WebScriptExecutionCallback callback,

‎patches/chromium/gin_enable_disable_v8_platform.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ index c19eb72e8d37fe8145b813d07875addf793e12dc..a5db8841773618814ac90f740201d4d7
3838
// Returns whether `Initialize` has already been invoked in the process.
3939
// Initialization is a one-way operation (i.e., this method cannot return
4040
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
41-
index f8d4be9d5bb00b4c66a53a7e26aee910bd2f7827..ef90742c78529a883a12c582c5950a7511cf5de0 100644
41+
index f407288fea875cf712e4d3128d02237d2014ce4e..ee73fad76593c8af5c8cef2ec1da56a77933e113 100644
4242
--- a/gin/v8_initializer.cc
4343
+++ b/gin/v8_initializer.cc
44-
@@ -480,7 +480,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
44+
@@ -472,7 +472,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
4545
// static
4646
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
4747
const std::string js_command_line_flags,
@@ -51,7 +51,7 @@ index f8d4be9d5bb00b4c66a53a7e26aee910bd2f7827..ef90742c78529a883a12c582c5950a75
5151
static bool v8_is_initialized = false;
5252
if (v8_is_initialized)
5353
return;
54-
@@ -490,7 +491,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
54+
@@ -482,7 +483,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
5555
// See https://crbug.com/v8/11043
5656
SetFlags(mode, js_command_line_flags);
5757

‎patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ index 39e18820db0d0c1b57f4375e01d269e53c839e4e..ea4da67a9b7798822d1d5dd90d09597a
2121
properties->supports_global_application_menus = true;
2222
properties->app_modal_dialogs_use_event_blocker = true;
2323
diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
24-
index 9d6534449f04baa7ebfc8604286b7d5f230e259a..cf23a05ee0a49f397b3605fb1e4510a86b40885d 100644
24+
index bc3dce09be325a1a1754da3311f15681f74ce88d..b02e0295ecd35844d3e40b03c73955f8a64cdd9c 100644
2525
--- a/ui/ozone/public/ozone_platform.h
2626
+++ b/ui/ozone/public/ozone_platform.h
27-
@@ -122,6 +122,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
27+
@@ -121,6 +121,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
2828
// Linux only: determines if Skia can fall back to the X11 output device.
2929
bool skia_can_fall_back_to_x11 = false;
3030

‎patches/chromium/load_v8_snapshot_in_browser_process.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ but due to the nature of electron, we need to load the v8 snapshot
99
in the browser process.
1010

1111
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
12-
index 547791ed0b7a176d3049a71fd1f90e35f29c0f9b..3ee750502ed8b58fc04e6fa89fe3916341f7362e 100644
12+
index 5e4c1f8d6c87299ec2f79b652e335e63c39b655f..98de040583e1148fbadd6e666006164156515bb9 100644
1313
--- a/content/app/content_main_runner_impl.cc
1414
+++ b/content/app/content_main_runner_impl.cc
1515
@@ -283,11 +283,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {

‎patches/chromium/mas_avoid_private_macos_api_usage.patch.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to
3535
system priority.
3636

3737
diff --git a/base/BUILD.gn b/base/BUILD.gn
38-
index 7af70d486bfef1be6265d4f7136b73bc371dd92e..8747282d74b9418e509bca4cdc3399b3ba1bae44 100644
38+
index 575149b2f3246c1bcc88b046fb1ae2dbeaa3b2a2..704ff05b8ec8475ad215bbde4ee6ab587a61c818 100644
3939
--- a/base/BUILD.gn
4040
+++ b/base/BUILD.gn
4141
@@ -1068,6 +1068,7 @@ component("base") {
@@ -1260,7 +1260,7 @@ index eb81a70e4d5d5cd3e6ae9b45f8cd1c795ea76c51..dc30306f2c5d20503399fc3a8860773a
12601260

12611261
} // namespace sandbox
12621262
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
1263-
index 9f1346108a24fdc93147eb31411d94c1f9064a44..238405c2f811d80ab58673d69b7a16e201e51818 100644
1263+
index 4feaed1ede9739cb92860c995c1f9730ff0abe84..8110ad78d07b1ebb8234865e619ab45551a1c6f0 100644
12641264
--- a/third_party/blink/renderer/core/BUILD.gn
12651265
+++ b/third_party/blink/renderer/core/BUILD.gn
12661266
@@ -317,6 +317,7 @@ component("core") {

‎patches/chromium/notification_provenance.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Pass RenderFrameHost through to PlatformNotificationService
77
so Electron can identify which renderer a notification came from.
88

99
diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
10-
index 738563f512ac818c0c05b6617bd90ac40a50bf37..08dd8bd95b6beaf30f65bda0d0ca0e799fee1cf8 100644
10+
index 37fb69de336c0051fab2db74054ea632c0a66586..c629cd02f868372d80657926e59ed099b6b7317a 100644
1111
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
1212
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
1313
@@ -198,6 +198,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(

‎patches/chromium/picture-in-picture.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ index 0d38b25bcb43f0bbedc1e71508e840a862c28a3c..94a36af528dfa220cfae6b9b1b0be131
3939
ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
4040
kCloseButtonIconSize));
4141
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
42-
index 8110f1c5909e8996b1d847267f0aab3eff8339fa..28d3689be10469fa9f6bd8e608717c4d13a92620 100644
42+
index f94dc33f7ffbc13fd9846c5b62f5de3ac80d03ba..ecabd4e26fa4eca960cdd890d6b174d1505471a7 100644
4343
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
4444
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
4545
@@ -17,9 +17,11 @@
@@ -54,7 +54,7 @@ index 8110f1c5909e8996b1d847267f0aab3eff8339fa..28d3689be10469fa9f6bd8e608717c4d
5454
#include "chrome/browser/ui/color/chrome_color_id.h"
5555
#include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
5656
#include "chrome/browser/ui/views/overlay/close_image_button.h"
57-
@@ -58,7 +60,7 @@
57+
@@ -59,7 +61,7 @@
5858
#include "ui/aura/window.h"
5959
#endif
6060

@@ -63,7 +63,7 @@ index 8110f1c5909e8996b1d847267f0aab3eff8339fa..28d3689be10469fa9f6bd8e608717c4d
6363
#include "chrome/browser/shell_integration_win.h"
6464
#include "content/public/browser/render_widget_host_view.h"
6565
#include "ui/aura/window.h"
66-
@@ -310,7 +312,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
66+
@@ -311,7 +313,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
6767
overlay_window->Init(std::move(params));
6868
overlay_window->OnRootViewReady();
6969

0 commit comments

Comments
 (0)