Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1

Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1.

Some non-gtk X11 builds need it.


BUG=None

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=181172

[M-A Ruel, 2013-02-06 18:53:35]

https://codereview.chromium.org/12213044/diff/1/chrome/chrome_tests.gypi
File chrome/chrome_tests.gypi (right):

https://codereview.chromium.org/12213044/diff/1/chrome/chrome_tests.gypi#newc...
chrome/chrome_tests.gypi:1674:
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
This one should trigger.

https://codereview.chromium.org/12213044/diff/1/chrome/chrome_tests.gypi#newc...
chrome/chrome_tests.gypi:3003:
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
That's how it should be done.

Interestingly interactive_ui_tests use toolkit_uses_gtk==1, which seems wrong to
me; FWIU, aura on linux can use X11 but not gtk, when used outside of chromeos.

[benrg, 2013-02-06 19:31:32]

https://codereview.chromium.org/12213044/diff/1/chrome/chrome_tests.gypi
File chrome/chrome_tests.gypi (right):

https://codereview.chromium.org/12213044/diff/1/chrome/chrome_tests.gypi#newc...
chrome/chrome_tests.gypi:1674:
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
On 2013/02/06 18:53:35, Marc-Antoine Ruel wrote:
> This one should trigger.

It doesn't in my regular source tree or my cros chroot source tree, but there
may be some local configuration weirdness I don't understand.

https://codereview.chromium.org/12213044/diff/1/chrome/chrome_tests.gypi#newc...
chrome/chrome_tests.gypi:3003:
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
On 2013/02/06 18:53:35, Marc-Antoine Ruel wrote:
> That's how it should be done.

Fixed.

[M-A Ruel, 2013-02-06 19:34:42]

https://codereview.chromium.org/12213044/diff/1/chrome/chrome_tests.gypi
File chrome/chrome_tests.gypi (right):

https://codereview.chromium.org/12213044/diff/1/chrome/chrome_tests.gypi#newc...
chrome/chrome_tests.gypi:1674:
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
On 2013/02/06 19:31:32, benrg wrote:
> On 2013/02/06 18:53:35, Marc-Antoine Ruel wrote:
> > This one should trigger.
> 
> It doesn't in my regular source tree or my cros chroot source tree, but there
> may be some local configuration weirdness I don't understand.

Well, that's the point; I'm pretty sure on chromiumos toolkit_uses_gtk==0 so
this is the condition that should be changed to use_x11. You can probably grep
all the .gypi files and fix them all. You'll probably want to cc on this CL
anyhow showing up on the blame list and the corresponding reviewer.

[benrg, 2013-02-06 21:12:21]

Ben, I eventually need owner approval for this, but also can you suggest a
reviewer? git blame is not very helpful.

(Ignore the first two patch sets)

[Ben Goodger (Google), 2013-02-06 21:13:32]

yeah lgtm from an owners perspective but for x11 stuff derat is a good choice.

[Daniel Erat, 2013-02-06 21:14:49]

lgtm

[commit-bot: I haz the power, 2013-02-06 22:13:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/benrg@chromium.org/12213044/8001

[commit-bot: I haz the power, 2013-02-07 03:21:52]

Change committed as 181172

[M-A Ruel, 2013-02-07 14:24:02]

On 2013/02/07 03:21:52, I haz the power (commit-bot) wrote:
> Change committed as 181172

Thanks for the fix!