base/message_loop/message_loop.h - Issue 23880006: gtk: Allow building both the X11 and Gtk message-pumps for gtk.

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.h

Issue 23880006: gtk: Allow building both the X11 and Gtk message-pumps for gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tot-merge Created 7 years, 3 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:

Index: base/message_loop/message_loop.h

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

index de602af2dfc585d9c2b76f5716fbbe9e05a647f5..bdad1b29b4ce3034e884fd151182688b3eb04449 100644

--- a/base/message_loop/message_loop.h

+++ b/base/message_loop/message_loop.h

@@ -36,7 +36,7 @@

#if !defined(OS_MACOSX) && !defined(OS_ANDROID)

#if defined(USE_AURA) && defined(USE_X11) && !defined(OS_NACL)

-#include "base/message_loop/message_pump_aurax11.h"

+#include "base/message_loop/message_pump_x11.h"

#elif defined(USE_OZONE) && !defined(OS_NACL)

#include "base/message_loop/message_pump_ozone.h"

#else

@@ -600,7 +600,7 @@ class BASE_EXPORT MessageLoopForUI : public MessageLoop {

protected:

#if defined(USE_AURA) && defined(USE_X11) && !defined(OS_NACL)

- friend class MessagePumpAuraX11;

+ friend class MessagePumpX11;

#endif

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

friend class MessagePumpOzone;

« no previous file with comments | « base/base.gypi ('k') | base/message_loop/message_pump_aurax11.h » ('j') | no next file with comments »