Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(915)

Unified Diff: trunk/src/base/base.gypi

Issue 238093002: Revert 263726 "x11: Remove X11 message-pump." (Closed) Base URL: svn://svn.chromium.org/chrome/
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
« no previous file with comments | « trunk/src/base/base.gyp ('k') | trunk/src/base/message_loop/message_loop.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/base/base.gypi
===================================================================
--- trunk/src/base/base.gypi (revision 263732)
+++ trunk/src/base/base.gypi (working copy)
@@ -733,6 +733,11 @@
'message_loop/message_pump_glib.cc',
],
}],
+ ['<(use_x11)==0 or >(nacl_untrusted_build)==1', {
+ 'sources!': [
+ 'message_loop/message_pump_x11.cc',
+ ],
+ }],
['<(toolkit_uses_gtk)==0 or >(nacl_untrusted_build)==1', {
'sources!': ['message_loop/message_pump_gtk.cc'],
}],
@@ -886,6 +891,7 @@
['<(use_ozone) == 1', {
'sources!': [
'message_loop/message_pump_glib.cc',
+ 'message_loop/message_pump_x11.cc',
]
}],
['OS == "linux" and >(nacl_untrusted_build)==0', {
« no previous file with comments | « trunk/src/base/base.gyp ('k') | trunk/src/base/message_loop/message_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698