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

chore: bump chromium to 92.0.4498.0 (master) (#28991)

Browse source
This commit is contained in:
Electron Bot 2021-05-05 16:26:17 -07:00 • committed by GitHub
parent 2086e1903c
commit 9d9921b533
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 75 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,27 +38,11 @@ SubmenuButton::SubmenuButton(PressedCallback callback,
SetInkDropMode(InkDropMode::ON);
SetInkDropBaseColor(
color_utils::BlendTowardMaxContrast(background_color_, 0x81));
views::InkDrop::UseInkDropForFloodFillRipple(this, false, true);
}
SubmenuButton::~SubmenuButton() = default;
std::unique_ptr<views::InkDropRipple> SubmenuButton::CreateInkDropRipple()
const {
std::unique_ptr<views::InkDropRipple> ripple(
new views::FloodFillInkDropRipple(
size(), GetInkDropCenterBasedOnLastEvent(), GetInkDropBaseColor(),
GetInkDropVisibleOpacity()));
return ripple;
}
std::unique_ptr<views::InkDrop> SubmenuButton::CreateInkDrop() {
std::unique_ptr<views::InkDropImpl> ink_drop =
views::Button::CreateDefaultInkDropImpl();
ink_drop->SetShowHighlightOnHover(false);
ink_drop->SetShowHighlightOnFocus(true);
return std::move(ink_drop);
}
void SubmenuButton::SetAcceleratorVisibility(bool visible) {
if (visible == show_underline_)
return;

4
shell/browser/ui/views/submenu_button.h
View file

@ -31,10 +31,6 @@ class SubmenuButton : public views::MenuButton {
// views::MenuButton:
void PaintButtonContents(gfx::Canvas* canvas) override;
// views::InkDropHostView:
std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
std::unique_ptr<views::InkDrop> CreateInkDrop() override;
private:
bool GetUnderlinePosition(const std::u16string& text,
char16_t* accelerator,