diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 23:25:38 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 23:25:38 +0000 |
commit | 1a24da5da18bac1e97ede472e0061568c4b76f26 (patch) | |
tree | 68f27982963c4c71ff73ad2f735e257ffb9d4212 /base/base.gypi | |
parent | f192729f8de098c357422f74fe6c0a530a9e90db (diff) | |
download | chromium_src-1a24da5da18bac1e97ede472e0061568c4b76f26.zip chromium_src-1a24da5da18bac1e97ede472e0061568c4b76f26.tar.gz chromium_src-1a24da5da18bac1e97ede472e0061568c4b76f26.tar.bz2 |
aura/cros: Rename MessagePump{X => AuraX11}.
So rename the MessagePumpX, which is an aurax11 only class now to MessagePumpAuraX11 (which also simplifies the gyp files).
BUG=129075
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10441028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
-rw-r--r-- | base/base.gypi | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/base/base.gypi b/base/base.gypi index 80634b4..b072a3e 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', |