base/message_loop/message_loop.cc - Issue 244093002: x11: Make the event-source work with both glib and libevent message-pumps.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/message_loop/message_loop.cc

Issue 244093002: x11: Make the event-source work with both glib and libevent message-pumps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: base/message_loop/message_loop.cc

diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc

index 193fe7c48ddc1a538bd69726fd0d62e8ba11f5eb..0ca6e81efabce6f9176f080b5ce9b3a5aa7142fd 100644

--- a/base/message_loop/message_loop.cc

+++ b/base/message_loop/message_loop.cc

@@ -670,7 +670,8 @@ void MessageLoopForUI::RemoveObserver(Observer* observer) {

}

#endif // !defined(OS_NACL) && defined(OS_WIN)

-#if defined(USE_OZONE) && !defined(OS_NACL)

+#if !defined(OS_NACL) && \

+ (defined(USE_OZONE) || (defined(OS_CHROMEOS) && !defined(USE_GLIB)))

bool MessageLoopForUI::WatchFileDescriptor(

int fd,

bool persistent,

« no previous file with comments | « base/message_loop/message_loop.h ('k') | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc » ('j') | no next file with comments »