Commit 9e0c6c21 authored by kylechar's avatar kylechar Committed by Commit Bot

Remove unnecessary #ifdef case.

Remove #ifdef USE_X11 && !USE_GLIB check. That would have been for the
X11 CrOS build which no longer exists.

Bug: none
Change-Id: Iccea3d36ef92ed1dde44773ce4a74184a7a2c37b
Reviewed-on: https://chromium-review.googlesource.com/1014281Reviewed-by: default avatarGabriel Charette <gab@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551801}
parent be9d1264
...@@ -157,8 +157,7 @@ bool MessageLoopCurrentForUI::IsSet() { ...@@ -157,8 +157,7 @@ bool MessageLoopCurrentForUI::IsSet() {
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
} }
#if (defined(USE_OZONE) && !defined(OS_FUCHSIA)) || \ #if defined(USE_OZONE) && !defined(OS_FUCHSIA)
(defined(USE_X11) && !defined(USE_GLIB))
bool MessageLoopCurrentForUI::WatchFileDescriptor( bool MessageLoopCurrentForUI::WatchFileDescriptor(
int fd, int fd,
bool persistent, bool persistent,
......
...@@ -215,8 +215,7 @@ class BASE_EXPORT MessageLoopCurrentForUI : public MessageLoopCurrent { ...@@ -215,8 +215,7 @@ class BASE_EXPORT MessageLoopCurrentForUI : public MessageLoopCurrent {
MessageLoopCurrentForUI* operator->() { return this; } MessageLoopCurrentForUI* operator->() { return this; }
#if (defined(USE_OZONE) && !defined(OS_FUCHSIA)) || \ #if defined(USE_OZONE) && !defined(OS_FUCHSIA)
(defined(USE_X11) && !defined(USE_GLIB))
// Please see MessagePumpLibevent for definition. // Please see MessagePumpLibevent for definition.
static_assert(std::is_same<MessagePumpForUI, MessagePumpLibevent>::value, static_assert(std::is_same<MessagePumpForUI, MessagePumpLibevent>::value,
"MessageLoopCurrentForUI::WatchFileDescriptor is not supported " "MessageLoopCurrentForUI::WatchFileDescriptor is not supported "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment