chore: bump chromium to 132.0.6826.0 (main) (#44584)
* chore: bump chromium in DEPS to 132.0.6821.0 * chore: bump chromium in DEPS to 132.0.6822.0 * chore: update patches * chore: bump chromium in DEPS to 132.0.6824.0 * chore: update patches * 5998172: Migrate remaining NOTREACHED()s in chrome/ |5998172
* 5872484: Pass along accelerators for menu items coming from DevTools |5872484
* chore: update patches * 5872913: Enable `raw_span` clang plugin [1/2] |5872913
* fixup! picture-in-picture import * 5912245: [video pip] Add progress bar to 2024 UI |5912245
* fixup! 5872913: Enable raw_span clang plugin [1/2] |5872913
--------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
This commit is contained in:
parent
f9a04012b9
commit
6e3a5daf62
46 changed files with 208 additions and 205 deletions
|
@ -9,15 +9,14 @@ 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 d236578cefc347e772305ac7ec54b9734e4aa20b..6bb89cea3b6b91ec8ea351ed60c4e4056a6340bb 100644
|
||||
index 91ef40b1c054ffceec006400c18d68b5ab393161..7a33b6e01b57b58a77ec54be59f6f3235dab936c 100644
|
||||
--- a/chrome/browser/ui/views/overlay/close_image_button.cc
|
||||
+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
|
||||
@@ -4,10 +4,13 @@
|
||||
@@ -4,9 +4,12 @@
|
||||
|
||||
#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)
|
||||
|
@ -26,7 +25,7 @@ index d236578cefc347e772305ac7ec54b9734e4aa20b..6bb89cea3b6b91ec8ea351ed60c4e405
|
|||
#include "ui/base/l10n/l10n_util.h"
|
||||
#include "ui/base/metadata/metadata_impl_macros.h"
|
||||
#include "ui/base/models/image_model.h"
|
||||
@@ -27,7 +30,10 @@ CloseImageButton::CloseImageButton(PressedCallback callback)
|
||||
@@ -26,7 +29,10 @@ CloseImageButton::CloseImageButton(PressedCallback callback)
|
||||
: OverlayWindowImageButton(std::move(callback)) {
|
||||
SetSize(gfx::Size(kCloseButtonSize, kCloseButtonSize));
|
||||
|
||||
|
@ -39,7 +38,7 @@ index d236578cefc347e772305ac7ec54b9734e4aa20b..6bb89cea3b6b91ec8ea351ed60c4e405
|
|||
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 3e78d9108ccfbc8ff702f7708f8ad5e5c7c8cee5..90fea34bade0b7ab6b00821317c18867ec4bffc0 100644
|
||||
index 0ca5d6f5680e5e1342a3ad75e4b0ebbda5122805..d3e8b53be5a5184c2cca905bebaec5a5a4a84569 100644
|
||||
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
||||
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
||||
@@ -17,9 +17,11 @@
|
||||
|
@ -63,7 +62,7 @@ index 3e78d9108ccfbc8ff702f7708f8ad5e5c7c8cee5..90fea34bade0b7ab6b00821317c18867
|
|||
#include "chrome/browser/shell_integration_win.h"
|
||||
#include "content/public/browser/render_widget_host_view.h"
|
||||
#include "ui/aura/window.h"
|
||||
@@ -328,7 +330,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
|
||||
@@ -323,7 +325,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