Rationalize linux vs x11 in ui

ui/ui.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'shell_dialogs.gypi',
@@ skipping 251 matching lines @@
         'base/models/tree_node_model.h',
         'base/range/range.cc',
         'base/range/range.h',
         'base/range/range_mac.mm',
         'base/range/range_win.cc',
         'base/resource/data_pack.cc',
         'base/resource/data_pack.h',
         'base/resource/resource_bundle.cc',
         'base/resource/resource_bundle.h',
         'base/resource/resource_bundle_android.cc',
-        'base/resource/resource_bundle_aurax11.cc',
+        'base/resource/resource_bundle_auralinux.cc',
         'base/resource/resource_bundle_gtk.cc',
         'base/resource/resource_bundle_ios.mm',
         'base/resource/resource_bundle_mac.mm',
         'base/resource/resource_bundle_win.cc',
         'base/resource/resource_bundle_win.h',
         'base/resource/resource_data_dll_win.cc',
         'base/resource/resource_data_dll_win.h',
         'base/resource/resource_handle.h',
         'base/text/bytes_formatting.cc',
         'base/text/bytes_formatting.h',
@@ skipping 345 matching lines @@
             'base/cursor/cursor_win.cc',
             'base/cursor/cursor_x11.cc',
             'base/x/selection_owner.cc',
             'base/x/selection_owner.h',
             'base/x/selection_requestor.cc',
             'base/x/selection_requestor.h',
             'base/x/selection_utils.cc',
             'base/x/selection_utils.h',
           ]
         }],
+        
+        ['use_aura==0 or OS!="linux"', {
+          'sources!': [
+            'base/resource/resource_bundle_auralinux.cc',
+          ],
+        }],
         ['use_aura==1 and OS=="win"', {
           'sources/': [
             ['exclude', 'base/dragdrop/drag_utils_aura.cc'],
           ],
         }],
         ['use_aura==0 and toolkit_views==0', {
           'sources/': [
             ['exclude', '^base/gestures/*'],
           ]
         }],
@@ skipping 159 matching lines @@
             ['exclude', 'base/x/*'],
           ],
         }],
         ['use_messagepump_linux==0', {
           'sources!': [
             'base/cursor/cursor_null.cc',
             'base/cursor/cursor_loader_null.cc',
             'base/cursor/cursor_loader_null.h',
           ],
         }],
-        ['toolkit_views==0', {
+        ['toolkit_views==0 and use_messagepump_linux==0', {
           'sources!': [
             'base/events/event.cc',
             'base/events/event.h',
             'base/events/event_dispatcher.cc',
             'base/events/event_dispatcher.h',
             'base/events/event_handler.cc',
             'base/events/event_handler.h',
             'base/events/event_target.cc',
             'base/events/event_target.h',
             'base/events/key_identifier_conversion.cc',
@@ skipping 165 matching lines @@
               'xcode_settings': {
                 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
               },
             }],
           ],
         },
       ],
     }],
   ],
 }