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

chore: bump chromium to 104.0.5073.0 (main) (#34272)

Browse source
This commit is contained in:
electron-roller[bot] 2022-06-01 08:12:47 +02:00 • committed by GitHub
parent 3849d19e14
commit 470396d6ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
112 changed files with 663 additions and 589 deletions
Download patch file Download diff file Expand all files Collapse all files

19
shell/browser/ui/views/client_frame_view_linux.cc
View file

@ -31,6 +31,7 @@
#include "ui/views/style/typography.h"
#include "ui/views/widget/widget.h"
#include "ui/views/window/frame_buttons.h"
#include "ui/views/window/window_button_order_provider.h"
namespace electron {
@ -83,11 +84,16 @@ ClientFrameViewLinux::ClientFrameViewLinux()
AddChildView(title_);
native_theme_observer_.Observe(theme_);
window_button_order_observer_.Observe(views::LinuxUI::instance());
if (views::LinuxUI* ui = views::LinuxUI::instance()) {
ui->AddWindowButtonOrderObserver(this);
OnWindowButtonOrderingChange();
}
}
ClientFrameViewLinux::~ClientFrameViewLinux() {
views::LinuxUI::instance()->RemoveWindowButtonOrderObserver(this);
if (views::LinuxUI* ui = views::LinuxUI::instance())
ui->RemoveWindowButtonOrderObserver(this);
theme_->RemoveObserver(this);
}
@ -159,11 +165,10 @@ void ClientFrameViewLinux::OnNativeThemeUpdated(
UpdateThemeValues();
}
void ClientFrameViewLinux::OnWindowButtonOrderingChange(
const std::vector<views::FrameButton>& leading_buttons,
const std::vector<views::FrameButton>& trailing_buttons) {
leading_frame_buttons_ = leading_buttons;
trailing_frame_buttons_ = trailing_buttons;
void ClientFrameViewLinux::OnWindowButtonOrderingChange() {
auto* provider = views::WindowButtonOrderProvider::GetInstance();
leading_frame_buttons_ = provider->leading_buttons();
trailing_frame_buttons_ = provider->trailing_buttons();
InvalidateLayout();
}