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

chore: bump chromium to 93.0.4536.0 (main) (#29586)

Browse source 
* chore: bump chromium in DEPS to 93.0.4536.0

* chore: update patches

* [2918475] Make InkDrop a View class property

Refs: 2918475

Replace old views::Button::ink_drop() calls with views::InkDrop::Get()

* [2935942] Convert use of gfx::ImageSkia to ui::ImageModel for WidgetDelegates

Refs: 2935942

Update GetWindowIcon(), GetWindowAppIcon(), and GetDevToolsWindowIcon()
to return ui::ImageModel instead of gfx::ImageSkia.

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
electron-roller[bot] 2021-06-08 15:22:43 -05:00 • committed by GitHub
parent 7b169c2884
commit 04679121d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 61 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

7
shell/browser/ui/views/submenu_button.cc
View file

@ -32,10 +32,11 @@ SubmenuButton::SubmenuButton(PressedCallback callback,
gfx::Canvas::SizeStringInt(GetText(), gfx::FontList(), &text_width_,
&text_height_, 0, 0);
ink_drop()->SetMode(views::InkDropHost::InkDropMode::ON);
ink_drop()->SetBaseColor(
views::InkDropHost* ink_drop = views::InkDrop::Get(this);
ink_drop->SetMode(views::InkDropHost::InkDropMode::ON);
ink_drop->SetBaseColor(
color_utils::BlendTowardMaxContrast(background_color_, 0x81));
views::InkDrop::UseInkDropForFloodFillRipple(ink_drop(), false, true);
views::InkDrop::UseInkDropForFloodFillRipple(ink_drop, false, true);
}
SubmenuButton::~SubmenuButton() = default;