diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 03:34:54 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 03:34:54 +0000 |
| commit | 82f884d6ffb1406788add09179de956d1d53c19a (patch) | |
| tree | 48b1b4dcbed83f1d29ec5075f258dcd2cee45faf /base/base.gypi | |
| parent | beeac2de62965716b8563f0092bdee8f2038150c (diff) | |
| download | chromium_src-82f884d6ffb1406788add09179de956d1d53c19a.zip chromium_src-82f884d6ffb1406788add09179de956d1d53c19a.tar.gz chromium_src-82f884d6ffb1406788add09179de956d1d53c19a.tar.bz2 | |
x11: Remove X11 message-pump.
The remaining use of the X11 mesage-pump was opening the connection to the
X11 server. This patch moves that out of the message-pump, into gfx. This
allows us to remove the X11 message-pump, and just use the base Glib-based
message-pump on Linux and ChromeOS.
BUG=354062
R=darin@chromium.org, sky@chromium.org
Previously landed in r263726, but reverted in r263733 to allow reverting another CL.
Review URL: https://codereview.chromium.org/235043005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/base/base.gypi b/base/base.gypi index 645ef66..92ecf6e 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -733,11 +733,6 @@ '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'], }], @@ -891,7 +886,6 @@ ['<(use_ozone) == 1', { 'sources!': [ 'message_loop/message_pump_glib.cc', - 'message_loop/message_pump_x11.cc', ] }], ['OS == "linux" and >(nacl_untrusted_build)==0', { |