github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

7535923: Rename ozone buildflags

Browse Source 
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7535923

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
clavin
2026-02-13 16:09:16 -08:00
parent c480f18b0e
commit 96e2a174fd
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shell/browser/api/electron_api_desktop_capturer.cc
View File

@@ -33,7 +33,7 @@
#include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
#include "third_party/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
#include "ui/display/win/display_info.h"
#elif BUILDFLAG(IS_OZONE_X11)
#elif BUILDFLAG(SUPPORTS_OZONE_X11)
#include "base/logging.h"
#include "ui/base/x/x11_display_util.h"
#include "ui/base/x/x11_util.h"
@@ -461,7 +461,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
for (auto& source : screen_sources) {
source.display_id = base::NumberToString(source.media_list_source.id.id);
}
#elif BUILDFLAG(IS_OZONE_X11)
#elif BUILDFLAG(SUPPORTS_OZONE_X11)
// On Linux, with X11, the source id is the numeric value of the
// display name atom and the display id is either the EDID or the
// loop index when that display was found (see

4
shell/browser/native_window_views.cc
View File

@@ -5,7 +5,7 @@
// FIXME(ckerr) this incorrect #include order is a temporary
// fix to unblock the roll. Will fix in an upgrade followup.
#include "ui/base/ozone_buildflags.h"
#if BUILDFLAG(IS_OZONE_X11)
#if BUILDFLAG(SUPPORTS_OZONE_X11)
#include "ui/base/x/x11_util.h"
#endif
@@ -65,7 +65,7 @@
#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
#include "ui/views/window/native_frame_view.h"
#if BUILDFLAG(IS_OZONE_X11)
#if BUILDFLAG(SUPPORTS_OZONE_X11)
#include "shell/browser/ui/views/global_menu_bar_x11.h"
#include "shell/browser/ui/x/event_disabler.h"
#include "shell/browser/ui/x/x_window_utils.h"

4
shell/browser/native_window_views.h
View File

@@ -36,7 +36,7 @@ class ClientFrameViewLinux;
class GlobalMenuBarX11;
#endif
#if BUILDFLAG(IS_OZONE_X11)
#if BUILDFLAG(SUPPORTS_OZONE_X11)
class EventDisabler;
#endif
@@ -273,7 +273,7 @@ class NativeWindowViews : public NativeWindow,
std::unique_ptr<GlobalMenuBarX11> global_menu_bar_;
#endif
#if BUILDFLAG(IS_OZONE_X11)
#if BUILDFLAG(SUPPORTS_OZONE_X11)
// To disable the mouse events.
std::unique_ptr<EventDisabler> event_disabler_;
#endif