Reland 102005 and 102009: aura: Explicitly disable GTK.

base/base.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 363 matching lines @@
         'mac_framework_dirs': [
           '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
         ],
         'conditions': [
           [ 'use_wayland == 1', {
             'sources!': [
               'message_pump_gtk.cc',
               'message_pump_x.cc',
             ],
           }],
-          [ 'toolkit_uses_gtk==0', {
+          [ 'use_glib==0', {
               'sources/': [
                 ['exclude', '^nix/'],
               ],
               'sources!': [
                 'atomicops_internals_x86_gcc.cc',
                 'message_pump_glib.cc',
-                'message_pump_gtk.cc',
                 'message_pump_x.cc',
               ],
           }],
+          [ 'toolkit_uses_gtk==0', {
+            'sources!': [ 'message_pump_gtk.cc', ],
+          }],
           [ 'touchui==0 and use_aura==0', {
             'sources!' : [ 'message_pump_x.cc', ],
           }, {
             'sources!' : [ 'message_pump_gtk.cc', ],
+            'sources/' : [ [ 'include', 'message_pump_x.cc', ] ],
           }],
           [ 'OS != "linux"', {
               'sources!': [
                 # Not automatically excluded by the *linux.cc rules.
                 'linux_util.cc',
               ],
             },
           ],
           [ 'OS != "mac"', {
               'sources!': [
@@ skipping 58 matching lines @@
         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
       # TODO(gregoryd): direct_dependent_settings should be shared with the
       #  64-bit target, but it doesn't work due to a bug in gyp
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'conditions': [
-        [ 'toolkit_uses_gtk==1', {
+        [ 'use_glib==1', {
           'conditions': [
             [ 'chromeos==1', {
                 'sources/': [ ['include', '_chromeos\\.cc$'] ]
               },
             ],
             [ 'linux_use_tcmalloc==0', {
                 'defines': [
                   'NO_TCMALLOC',
                 ],
                 'direct_dependent_settings': {
                   'defines': [
                     'NO_TCMALLOC',
                   ],
                 },
               },
             ],
+            [ 'toolkit_uses_gtk==1', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+              'export_dependent_settings': [
+                '../build/linux/system.gyp:gtk',
+              ],
+            }],
           ],
           'dependencies': [
             'symbolize',
             '../build/util/build_util.gyp:lastchange#target',
-            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:glib',
             '../build/linux/system.gyp:x11',
             'xdg_mime',
           ],
           'defines': [
             'USE_SYMBOLIZE',
           ],
           'cflags': [
             '-Wno-write-strings',
           ],
           'export_dependent_settings': [
-            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:glib',
             '../build/linux/system.gyp:x11',
           ],
-        }, {  # toolkit_uses_gtk!=1
+        }, {  # use_glib!=1
             'sources/': [
               ['exclude', '/xdg_user_dirs/'],
               ['exclude', '_nss\.cc$'],
             ],
         }],
         [ 'OS == "freebsd" or OS == "openbsd"', {
           'link_settings': {
             'libraries': [
               '-L/usr/local/lib -lexecinfo',
               ],
@@ skipping 198 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }