mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 133.0.6943.35 (35-x-y) (#45217)

Browse source 
* chore: bump chromium in DEPS to 133.0.6943.16

* chore: bump chromium in DEPS to 133.0.6943.27

* chore: bump chromium in DEPS to 133.0.6943.35

* chore: bump chromium to 134.0.6968.0

cherry picked from 75eac86506

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2025-02-03 15:10:57 -05:00 • committed by GitHub
parent 599030ea08
commit 49078100f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
122 changed files with 682 additions and 622 deletions
Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/ui/status_icon_gtk.cc
View file

@ -12,6 +12,7 @@
#include "shell/browser/ui/gtk/menu_gtk.h"
#include "shell/browser/ui/gtk_util.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/paint_vector_icon.h"
namespace electron {
@ -29,7 +30,7 @@ StatusIconGtk::StatusIconGtk() : icon_(TakeGObject(gtk_status_icon_new())) {
StatusIconGtk::~StatusIconGtk() = default;
void StatusIconGtk::SetIcon(const gfx::ImageSkia& image) {
void StatusIconGtk::SetImage(const gfx::ImageSkia& image) {
if (image.isNull())
return;
@ -38,6 +39,10 @@ void StatusIconGtk::SetIcon(const gfx::ImageSkia& image) {
g_object_unref(pixbuf);
}
void StatusIconGtk::SetIcon(const gfx::VectorIcon& icon) {
SetImage(gfx::CreateVectorIcon(icon, SK_ColorBLACK));
}
void StatusIconGtk::SetToolTip(const std::u16string& tool_tip) {
gtk_status_icon_set_tooltip_text(icon_, base::UTF16ToUTF8(tool_tip).c_str());
}
@ -53,7 +58,7 @@ void StatusIconGtk::RefreshPlatformContextMenu() {
}
void StatusIconGtk::OnSetDelegate() {
SetIcon(delegate_->GetImage());
SetImage(delegate_->GetImage());
SetToolTip(delegate_->GetToolTip());
UpdatePlatformContextMenu(delegate_->GetMenuModel());
gtk_status_icon_set_visible(icon_, TRUE);