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

refactor: replace USE_X11 with OS_LINUX for sharing code with Ozone (#25522)

Browse source
This commit is contained in:
Valentin Hăloiu 2020-09-21 02:11:59 +02:00 • committed by GitHub
parent 137fc65e2f
commit efd003d277
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
shell/browser/native_window_views.cc
View file

@ -192,7 +192,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
params.parent = parent->GetNativeWindow();
params.native_widget = new ElectronDesktopNativeWidgetAura(this);
#elif defined(USE_X11)
#elif defined(OS_LINUX)
std::string name = Browser::Get()->GetName();
// Set WM_WINDOW_ROLE.
params.wm_role_name = "browser-window";
@ -482,7 +482,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable) {
#endif
}
#if defined(USE_X11)
#if defined(OS_LINUX)
void NativeWindowViews::Maximize() {
if (IsVisible())
widget()->Maximize();
@ -798,7 +798,7 @@ bool NativeWindowViews::IsClosable() {
return false;
}
return !(info.fState & MFS_DISABLED);
#elif defined(USE_X11)
#elif defined(OS_LINUX)
return true;
#endif
}
@ -1138,7 +1138,7 @@ void NativeWindowViews::SetProgressBar(double progress,
NativeWindow::ProgressState state) {
#if defined(OS_WIN)
taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
#elif defined(USE_X11)
#elif defined(OS_LINUX)
if (unity::IsRunning()) {
unity::SetProgressFraction(progress);
}
@ -1194,7 +1194,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopMediaID() const {
#if defined(OS_WIN)
window_handle =
reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
#elif defined(USE_X11)
#elif defined(OS_LINUX)
window_handle = static_cast<uint32_t>(accelerated_widget);
#endif
aura::WindowTreeHost* const host =
@ -1297,7 +1297,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HICON app_icon) {
SendMessage(hwnd, WM_SETICON, ICON_BIG,
reinterpret_cast<LPARAM>(app_icon_.get()));
}
#elif defined(USE_X11)
#elif defined(OS_LINUX)
void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
GetAcceleratedWidget());
@ -1382,7 +1382,7 @@ bool NativeWindowViews::CanMaximize() const {
bool NativeWindowViews::CanMinimize() const {
#if defined(OS_WIN)
return minimizable_;
#elif defined(USE_X11)
#elif defined(OS_LINUX)
return true;
#endif
}