Update the gyp Linux build:

chrome/chrome.gyp

 # Copyright (c) 2009 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': [
     '../build/common.gypi',
@@ skipping 286 matching lines @@
         'common/x11_util.h',
         'common/x11_util_internal.h',
         'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'conditions': [
-        ['OS!="linux"', {
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }, { # else: 'OS!="linux"'
           'sources!': [
             'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',
           ],
           'sources!': [
             'common/temp_scaffolding_stubs.cc',
@@ skipping 882 matching lines @@
         'browser/webdata/web_database_win.cc',
         'browser/window_sizer.cc',
         'browser/window_sizer.h',
         'browser/worker_host/worker_process_host.cc',
         'browser/worker_host/worker_process_host.h',
         'browser/worker_host/worker_service.cc',
         'browser/worker_host/worker_service.h',
       ],
       'conditions': [
         ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
           'sources!': [
             'browser/debugger/debugger_shell_stubs.cc',
             # Windows-specific files.
             'browser/download/download_exe.cc',
             'browser/download/download_util.cc',
           ],
         }],
         ['OS=="mac"', {
           'sources/': [
             # Exclude most of download.
@@ skipping 187 matching lines @@
         'renderer/webplugin_delegate_proxy.h',
         'renderer/webworker_proxy.cc',
         'renderer/webworker_proxy.h',
       ],
       'link_settings': {
         'mac_bundle_resources': [
           'renderer/renderer.sb',
         ],
       },
       'conditions': [
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',
           ],
           'dependencies': [
             'plugin',
           ],
         },],
         ['OS!="win"', {
           'sources!': [
@@ skipping 55 matching lines @@
       # be necessary to list app-Info.plist once, not the three times it is
       # listed here.
       'mac_bundle_resources!': [
         'app/app-Info.plist',
       ],
       'xcode_settings': {
         'INFOPLIST_FILE': 'app/app-Info.plist',
       },
       'conditions': [
         ['OS=="linux"', {
+          'dependencies': [
+            'views',
+            # Needed for chrome_dll_main.cc #include of gtk/gtk.h
+            '../build/linux/system.gyp:gtk',
+          ],
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)',
               'files': ['<(INTERMEDIATE_DIR)/repack/chrome.pak'],
             },
             {
               'destination': '<(PRODUCT_DIR)/locales',
               'files': ['<(INTERMEDIATE_DIR)/repack/en-US.pak'],
             },
             {
@@ skipping 195 matching lines @@
         'test/automation/browser_proxy.cc',
         'test/automation/browser_proxy.h',
         'test/automation/tab_proxy.cc',
         'test/automation/tab_proxy.h',
         'test/automation/window_proxy.cc',
         'test/automation/window_proxy.h',
         'test/testing_profile.cc',
         'test/testing_profile.h',
       ],
       'conditions': [
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',
           ],
         }, { # else: OS != "win"
           'sources!': [
             'test/automation/window_proxy.cc',
             'test/automation/window_proxy.h',
           ],
         }],
@@ skipping 15 matching lines @@
         'test/testing_browser_process.h',
         'test/ui/npapi_test_helper.cc',
         'test/ui/npapi_test_helper.h',
         'test/ui/run_all_unittests.cc',
         'test/ui/ui_test.cc',
         'test/ui/ui_test.h',
         'test/ui/ui_test_suite.cc',
         'test/ui/ui_test_suite.h',
       ],
       'conditions': [
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
         ['OS!="win"', {
           'sources!': [
             'test/ui/npapi_test_helper.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'test_support_unit',
       'type': 'static_library',
       'dependencies': [
         'test_support_common',
         'resources',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/unit/run_all_unittests.cc',
       ],
+      'conditions': [
+        ['OS=="linux"', {
+          'dependencies': [
+            # Needed for the following #include chain:
+            #   test/unit/run_all_unittests.cc
+            #   test/unit/chrome_test_suite.h
+            #   gtk/gtk.h
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'ipc_tests',
       'type': 'executable',
       'dependencies': [
         'common',
         'test_support_unit',
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'common/ipc_fuzzing_tests.cc',
         'common/ipc_message_unittest.cc',
         'common/ipc_send_fds_test.cc',
         'common/ipc_sync_channel_unittest.cc',
         'common/ipc_sync_message_unittest.cc',
         'common/ipc_sync_message_unittest.h',
         'common/ipc_tests.cc',
         'common/ipc_tests.h',
       ],
+      'conditions': [
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'ui_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
         'common',
         'resources',
         'test_support_ui',
         '../base/base.gyp:base',
@@ skipping 56 matching lines @@
         'test/ui/dom_checker_uitest.cc',
         'test/ui/history_uitest.cc',
         'test/ui/inspector_controller_uitest.cc',
         'test/ui/layout_plugin_uitest.cpp',
         'test/ui/npapi_uitest.cpp',
         'test/ui/omnibox_uitest.cc',
         'test/ui/sandbox_uitests.cc',
       ],
       'conditions': [
         ['OS=="linux"', {
+          'dependencies': [
+            'views',
+            '../build/linux/system.gyp:gtk',
+          ],
           'sources!': [
             # TODO(port)
             'app/chrome_main_uitest.cc',
             'browser/browser_uitest.cc',
             'browser/crash_recovery_uitest.cc',
             'browser/download/download_uitest.cc',
             'browser/download/save_page_uitest.cc',
             'browser/errorpage_uitest.cc',
             'browser/iframe_uitest.cc',
             'browser/interstitial_page_uitest.cc',
             'browser/login_prompt_uitest.cc',
             'browser/metrics/metrics_service_uitest.cc',
             'browser/renderer_host/resource_dispatcher_host_uitest.cc',
             'browser/sanity_uitest.cc',
             'browser/sessions/session_restore_uitest.cc',
             'browser/tab_contents/view_source_uitest.cc',
             'common/net/cache_uitest.cc',
             'common/pref_service_uitest.cc',
             'test/reliability/page_load_test.cc',
             'test/ui/dom_checker_uitest.cc',
             'test/ui/history_uitest.cc',
             'test/ui/layout_plugin_uitest.cpp',
             'test/ui/omnibox_uitest.cc',
           ],
-          'dependencies': [
-            'views',
-          ],
         }],
         ['OS=="mac"', {
           # mac tests load the resources from the built app beside the test
           'dependencies': ['app'],
           # Mac doesn't have real ui_tests yet, just a dummy stub that
           # looks like a test.  Since it's not a real ui_test, exclude
           # the sources and just re-use test/unit/run_all_unittests.cc.
           'sources=': [
             'test/unit/run_all_unittests.cc',
           ],
@@ skipping 185 matching lines @@
         'test/browser_with_test_window_test.cc',
         'test/browser_with_test_window_test.h',
         'test/in_process_browser_test.cc',
         'test/in_process_browser_test.h',
         'test/test_notification_tracker.cc',
         'test/test_notification_tracker.h',
         'test/test_tab_contents.cc',
         'test/test_tab_contents.h',
         'test/v8_unit_test.cc',
         'test/v8_unit_test.h',
+        'views/controls/label_unittest.cc',
+        'views/controls/table/table_view_unittest.cc',
+        'views/controls/tree/tree_node_iterator_unittest.cc',
+        'views/focus/focus_manager_unittest.cc',
+        'views/grid_layout_unittest.cc',
+        'views/view_unittest.cc',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             'views',
+            '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:nss',
           ],
         }],
         ['OS=="win"', {
           'defines': [
             '__STD_C',
             '_CRT_SECURE_NO_DEPRECATE',
             '_SCL_SECURE_NO_DEPRECATE',
           ],
           'include_dirs': [
             'third_party/wtl/include',
           ],
           'sources!': [
             'common/file_descriptor_set_unittest.cc',
             'common/net/url_util_unittest.cc',
           ],
           'dependencies': [
             'views',
           ],
-        },],
-        ['OS!="win"', {
+        }, { # else: OS != "win"
           'sources!': [
             'browser/back_forward_menu_model_unittest.cc',
             'browser/bookmarks/bookmark_drag_data_unittest.cc',
             'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
             'browser/bookmarks/bookmark_html_writer_unittest.cc',
             'browser/bookmarks/bookmark_table_model_unittest.cc',
             'browser/bookmarks/bookmark_utils_unittest.cc',
             'browser/browser_commands_unittest.cc',
             'browser/download/download_manager_unittest.cc',
             'browser/download/download_request_manager_unittest.cc',
@@ skipping 32 matching lines @@
             'renderer/render_view_unittest.cc',
             'renderer/render_widget_unittest.cc',
             'test/browser_with_test_window_test.cc',
             'test/browser_with_test_window_test.h',
             'test/in_process_browser_test.cc',
             'test/in_process_browser_test.h',
             'test/test_notification_tracker.cc',
             'test/test_notification_tracker.h',
             'test/ui_test_utils.cc',
             'test/ui_test_utils.h',
+            'views/controls/label_unittest.cc',
+            'views/controls/table/table_view_unittest.cc',
+            'views/focus/focus_manager_unittest.cc',
+            'views/grid_layout_unittest.cc',
+            'views/view_unittest.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'startup_tests',
       'type': 'executable',
       'dependencies': [
         'app',
         'browser',
         'common',
         'resources',
         'test_support_ui',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'test/startup/feature_startup_test.cc',
         'test/startup/startup_test.cc',
         'tools/build/win/precompiled.cc',
         'tools/build/win/precompiled.h',
       ],
       'conditions': [
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
         ['OS!="win"', {
           'sources!': [
             'test/startup/feature_startup_test.cc',
             'tools/build/win/precompiled.cc',
             'tools/build/win/precompiled.h',
           ],
         }],
       ],
     },
   ],
@@ skipping 33 matching lines @@
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
           ],
           'sources': [
             'test/page_cycler/page_cycler_test.cc',
             'tools/build/win/precompiled.cc',
             'tools/build/win/precompiled.h',
           ],
           'conditions': [
             ['OS!="win"', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+            }],
+            ['OS!="win"', {
               'sources!': [
                 'tools/build/win/precompiled.cc',
                 'tools/build/win/precompiled.h',
               ],
             }],
           ],
         },
         {
           'target_name': 'perf_tests',
           'type': 'executable',
           'dependencies': [
             'browser',
             'common',
             'resources',
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
           ],
           'sources': [
             'browser/visitedlink_perftest.cc',
             'test/perf/perftests.cc',
             'test/perf/url_parse_perftest.cc',
           ],
           'conditions': [
             ['OS=="linux"', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
               'sources!': [
                 # TODO(port):
                 'browser/visitedlink_perftest.cc',
               ],
             }],
           ],
         },
       ],
     }],  # OS!="mac"
     ['OS=="win" or OS=="linux"',
@@ skipping 150 matching lines @@
             'views/window/native_frame_view.h',
             'views/window/non_client_view.cc',
             'views/window/non_client_view.h',
             'views/window/window.h',
             'views/window/window_delegate.cc',
             'views/window/window_delegate.h',
             'views/window/window_resources.h',
             'views/window/window_win.cc',
             'views/window/window_win.h',
           ],
-          # These are layered in conditionals in the event other platforms
-          # end up using this module as well.
           'conditions': [
+            ['OS=="linux"', {
+              'dependencies': [
+                '../build/linux/system.gyp:gtk',
+              ],
+              'sources!': [
+                'views/accelerator.cc',
+                'views/accessibility/accessible_wrapper.cc',
+                'views/accessibility/view_accessibility.cc',
+                'views/controls/scrollbar/bitmap_scroll_bar.cc',
+                'views/controls/button/image_button.cc',
+                'views/controls/button/button_dropdown.cc',
+                'views/controls/button/checkbox.cc',
+                'views/controls/menu/chrome_menu.cc',
+                'views/controls/combo_box.cc',
+                'views/focus/focus_manager.cc',
+                'views/controls/table/group_table_view.cc',
+                'views/controls/hwnd_view.cc',
+                'views/controls/link.cc',
+                'views/controls/menu/menu.cc',
+                'views/controls/button/menu_button.cc',
+                'views/controls/message_box_view.cc',
+                'views/controls/button/native_button.cc',
+                'views/controls/native_control.cc',
+                'views/controls/scrollbar/native_scroll_bar.cc',
+                'views/controls/button/radio_button.cc',
+                'views/resize_corner.cc',
+                'views/controls/separator.cc',
+                'views/controls/single_split_view.cc',
+                'views/controls/tabbed_pane.cc',
+                'views/controls/table/table_view.cc',
+                'views/controls/text_field.cc',
+                'views/controls/tree/tree_view.cc',
+                'views/widget/accelerator_handler.cc',
+                'views/widget/aero_tooltip_manager.cc',
+                'views/widget/root_view_drop_target.cc',
+                'views/widget/tooltip_manager.cc',
+                'views/window/client_view.cc',
+                'views/window/custom_frame_view.cc',
+                'views/window/dialog_delegate.cc',
+                'views/window/dialog_client_view.cc',
+                'views/window/native_frame_view.cc',
+                'views/window/non_client_view.cc',
+                'views/window/window_delegate.cc',
+              ],
+            }],
             ['OS=="win"', {
               'defines': [
                 '__STD_C',
                 '_CRT_SECURE_NO_DEPRECATE',
                 '_SCL_SECURE_NO_DEPRECATE',
               ],
               'include_dirs': [
                 'third_party/wtl/include',
               ],
             },],
@@ skipping 37 matching lines @@
                 'views/window/dialog_delegate.cc',
                 'views/window/dialog_client_view.cc',
                 'views/window/native_frame_view.cc',
                 'views/window/non_client_view.cc',
                 'views/window/window_delegate.cc',
                 'views/window/window_win.cc',
               ],
             }],
           ],
         },
+      ],
+    }], # OS=="win" or OS=="linux"
+    ['OS=="win"',
+      { 'targets': [
         {
           'target_name': 'plugin',
           'type': 'static_library',
           'dependencies': [
             'common',
             'resources',
             '../media/media.gyp:media',
             '../skia/skia.gyp:skia',
             '../third_party/icu38/icu38.gyp:icui18n',
             '../third_party/icu38/icu38.gyp:icuuc',
@@ skipping 73 matching lines @@
             'Debug': {
               'msvs_precompiled_header': 'tools/build/win/precompiled.h',
               'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
             },
           },
         },
       ]},  # 'targets'
     ],  # OS=="win"
   ],  # 'conditions'
 }