Make the gyp files more cross-platform across the Unices

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 3560 matching lines @@
             ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
             ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
             ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
             ['exclude', '^browser/ui/views/handle_web_keyboard_event_gtk.cc'],
             ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_views.*'],
             ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.*'],
             ['exclude', '^browser/chromeos/input_method/candidate_window.cc'],
             ['exclude', '^browser/chromeos/input_method/candidate_window.h'],
           ],
         }],
-        ['OS=="linux"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus-glib',
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:nss',
             '../build/linux/system.gyp:x11',
             '../third_party/undoview/undoview.gyp:undoview',
           ],
           'link_settings': {
@@ skipping 47 matching lines @@
                 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
                 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
               ],
             }],
             ['linux_sandbox_path != ""', {
               'defines': [
                 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
               ],
             }],
           ],
-        }, {  # OS != "linux"
+        }, {  # toolkit_uses_gtk != 1
           'sources!': [
             # TODO(mattm): Cert manager stuff is really !USE_NSS.
             'browser/certificate_manager_model.cc',
             'browser/certificate_manager_model.h',
             'browser/ui/webui/options/certificate_manager_handler.cc',
             'browser/ui/webui/options/certificate_manager_handler.h',
           ],
         }],
-        ['OS=="freebsd" or OS=="openbsd"', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:gtkprint',
-            '../build/linux/system.gyp:nss',
-            '../build/linux/system.gyp:x11',
-          ],
-        }],
         ['OS=="mac"', {
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
             'browser/bookmarks/bookmark_context_menu.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
             'browser/first_run/upgrade_util.cc',
             'browser/first_run/upgrade_util.h',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/jankometer.cc',
@@ skipping 581 matching lines @@
                 ['include', '^browser/ui/views/notifications/balloon_view.h'],
                 ['exclude', '^browser/ui/views/keyboard_overlay_delegate.cc'],
                 ['exclude', '^browser/ui/views/keyboard_overlay_delegate.h'],
                 ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.cc'],
                 ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.h'],
                 ['exclude', '^browser/ui/views/select_file_dialog.cc'],
               ],
             }],
             # Exclude extension_input_ui_api again
             # (Required because of the '^browser/extensions/' include abrove)
-            ['OS=="linux" and ( touchui==0 or chromeos==0 )', {
+            ['toolkit_uses_gtk == 1 and ( touchui == 0 or chromeos == 0 )', {
               'sources/': [
                 ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
                 ['exclude', '^browser/extensions/extension_input_ui_api.h'],
               ],
             }],
             # GTK build only
-            ['OS=="linux" and toolkit_views==0', {
+            ['toolkit_uses_gtk == 1 and toolkit_views == 0', {
               'sources/': [
                 ['include', '^browser/printing/print_dialog_gtk.cc'],
                 ['include', '^browser/printing/print_dialog_gtk.h'],
                 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
                 ['exclude', '^browser/ui/browser_list_stub.cc'],
                 ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.cc'],
                 ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.h'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.cc'],
@@ skipping 67 matching lines @@
                     '../third_party/protobuf/protobuf.gyp:protoc',
                   ],
                   'action': [
                     '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
                     'browser/metrics/system_metrics.proto',
                     '--cpp_out=<(INTERMEDIATE_DIR)/chrome',
                   ],
                 },
               ],
             }],
-            ['OS=="linux" and gcc_version==45', {
+            ['os_posix == 1 and OS != "mac" and gcc_version == 45', {
               # Avoid gcc 4.5 miscompilation of template_url.cc
               # as per http://crbug.com/41887
               'cflags': [
                 '-fno-ipa-cp',
               ],
             }],
           ],
           # Exclude files that should be excluded for all non-Windows platforms.
           'sources!': [
             'browser/accessibility/browser_accessibility_manager_win.cc',
@@ skipping 197 matching lines @@
       'hard_dependency': 1,
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: