x11: Include X11 dependencies only when building with X11.

ui/ui.gyp

Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 02c8bda377bd1ffa8f6cb3def235515a0763c1cf..3ae227923ffc797a196e031d98d35bdf5aa4b867 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -615,17 +615,7 @@
             '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:glib',
             '../build/linux/system.gyp:pangocairo',
-            '../build/linux/system.gyp:x11',
-            '../build/linux/system.gyp:xext',
-            '../build/linux/system.gyp:xfixes',
           ],
-          'link_settings': {
-            'libraries': [
-              '-lXcursor',  # For XCursor* function calls in x11_util.cc.
-              '-lXrender',  # For XRender* function calls in x11_util.cc.
-              '-lXrandr',   # For XRR* function calls in x11_util.cc.
-            ],
-          },
           'conditions': [
             ['toolkit_views==0', {
               # Note: because of gyp predence rules this has to be defined as
@@ -769,9 +759,23 @@
                 '-lX11',
                 '-lXcursor',
                 '-lXrandr',  # For XRR* function calls in x11_util.cc.
+                '-lXrender',  # For XRender* function calls in x11_util.cc.
               ],
             },
           },
+          'link_settings': {
+            'libraries': [
+              '-lX11',
+              '-lXcursor',
+              '-lXrandr',  # For XRR* function calls in x11_util.cc.
+              '-lXrender',  # For XRender* function calls in x11_util.cc.
+            ],
+          },
+          'dependencies': [
+            '../build/linux/system.gyp:x11',
+            '../build/linux/system.gyp:xext',
+            '../build/linux/system.gyp:xfixes',
+          ],
         }, {  # use_x11==0
           'sources/': [
             ['exclude', 'base/keycodes/keyboard_code_conversion_x.*'],