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

Unified Diff: base/base.gypi

Issue 10441028: aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error in file added in the interim Created 8 years, 7 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 | « no previous file | base/message_loop.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 80634b46f9ac8a1c547245ace468a51d33d9ed38..b072a3e6593f58478e97642d0545b92140ba0066 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -483,18 +483,12 @@
'sources!': [
'atomicops_internals_x86_gcc.cc',
'message_pump_glib.cc',
- 'message_pump_x.cc',
+ 'message_pump_aurax11.cc',
],
}],
[ 'toolkit_uses_gtk==0', {
'sources!': [ 'message_pump_gtk.cc', ],
}],
- [ 'use_aura==0 or OS == "win" or OS == "mac"', {
- 'sources!' : [ 'message_pump_x.cc', ],
- }, {
- 'sources!' : [ 'message_pump_gtk.cc', ],
- 'sources/' : [ [ 'include', '^message_pump_x\\.cc$', ] ],
- }],
[ 'OS != "linux" and os_bsd != 1', {
'sources!': [
# Not automatically excluded by the *linux.cc rules.
@@ -797,8 +791,8 @@
'message_pump_gtk.cc',
'message_pump_gtk.h',
'message_pump_observer.h',
- 'message_pump_x.cc',
- 'message_pump_x.h',
+ 'message_pump_aurax11.cc',
+ 'message_pump_aurax11.h',
'message_pump_libevent.cc',
'message_pump_libevent.h',
'message_pump_mac.h',
« no previous file with comments | « no previous file | base/message_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698