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

2
shell/browser/ui/inspectable_web_contents_view_delegate.h
View file

@ -23,7 +23,7 @@ class InspectableWebContentsViewDelegate {
// Returns the icon of devtools window.
virtual gfx::ImageSkia GetDevToolsWindowIcon();
#if defined(USE_X11)
#if defined(OS_LINUX)
// Called when creating devtools window.
virtual void GetDevToolsWindowWMClass(std::string* name,
std::string* class_name) {}

2
shell/browser/ui/views/inspectable_web_contents_view_views.cc
View file

@ -186,7 +186,7 @@ void InspectableWebContentsViewViews::SetIsDocked(bool docked, bool activate) {
params.delegate = devtools_window_delegate_;
params.bounds = inspectable_web_contents()->GetDevToolsBounds();
#if defined(USE_X11)
#if defined(OS_LINUX)
params.wm_role_name = "devtools";
if (GetDelegate())
GetDelegate()->GetDevToolsWindowWMClass(&params.wm_class_name,