chore: bump chromium to 137.0.7141.0 (main) (#46725)
* chore: bump chromium in DEPS to 137.0.7139.0 * chore: bump chromium in DEPS to 137.0.7141.0 * chore: update patches Refs6474596
Refs6443472
Refs6471184
* [ServiceWorker] Pipe is_for_service_worker into OverrideURLLoaderFactoryParams Refs6459481
* Reland "[PermissionOptions] Use PermissionDescriptorPtr in PermissionControllerDelegate" Refs6455975
* clickiness: Check attestation and user settings on origins Refs6356796
* extensions : Move ReloadExtension from ExtensionService Refs6472812
Refs6472777
* fixup! Update AppleKeychain API to be friendlier Refs6443472
* chore: script/gen-libc++-filenames.js * Rename ColorVariant::CovertToSkColor() to ColorVariant::ResolveToSkColor() Refs6373793
* [headless] Provide headless aware window metrics on Windows Refs6374074
--------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
parent
e9f279afd1
commit
08b7a1f801
68 changed files with 393 additions and 371 deletions
|
@ -38,10 +38,10 @@ index 8168b4cfbafd42fa93a5aa9a3691c2552fabfb86..ba49212bd76d209f99c1cee649fc1466
|
|||
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 81f83c6d9ad03049b368a1994b5606ec12ce04dd..43dc9886e0e08d6651810b3f9b3ed5453d8c41ab 100644
|
||||
index c65308ac3bec1e6399c74f5d0bcf59364db4e997..5012789f084113a9289e8d198eed2f021953bef9 100644
|
||||
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
||||
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
||||
@@ -18,9 +18,11 @@
|
||||
@@ -19,9 +19,11 @@
|
||||
#include "build/build_config.h"
|
||||
#include "chrome/browser/picture_in_picture/picture_in_picture_occlusion_tracker.h"
|
||||
#include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h"
|
||||
|
@ -53,7 +53,7 @@ index 81f83c6d9ad03049b368a1994b5606ec12ce04dd..43dc9886e0e08d6651810b3f9b3ed545
|
|||
#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"
|
||||
@@ -71,7 +73,7 @@
|
||||
@@ -72,7 +74,7 @@
|
||||
#include "ui/aura/window.h"
|
||||
#endif
|
||||
|
||||
|
@ -62,7 +62,7 @@ index 81f83c6d9ad03049b368a1994b5606ec12ce04dd..43dc9886e0e08d6651810b3f9b3ed545
|
|||
#include "chrome/browser/shell_integration_win.h"
|
||||
#include "content/public/browser/render_widget_host_view.h"
|
||||
#include "ui/aura/window.h"
|
||||
@@ -395,7 +397,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
|
||||
@@ -396,7 +398,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
|
||||
overlay_window->Init(std::move(params));
|
||||
overlay_window->OnRootViewReady();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue