First pass at chrome_browser gyp simplification.

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 4293 matching lines @@
             ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.cc'],
             ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.h'],
             ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.cc'],
             ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.h'],
             ['exclude', 'browser/ui/webui/about_page/about_page_handler.cc'],
             ['exclude', 'browser/ui/webui/about_page/about_page_handler.h'],
             ['exclude', 'browser/ui/webui/about_page/about_page_ui.cc'],
             ['exclude', 'browser/ui/webui/about_page/about_page_ui.h'],
             ['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
           ],
-        }],
-        ['chromeos==1', {
+        }, { # !chromeos==0

[Lei Zhang, 2012/02/04 01:58:15]

nit, double space before '#'

[Emmanuel Saint-loubert-Bié, 2012/02/05 17:37:17]

Done.

           'dependencies': [
+            'browser/chromeos/input_method/input_method.gyp:gencode',
+            '../build/linux/system.gyp:dbus',
             '../build/linux/system.gyp:dbus-glib',
+            '../build/linux/system.gyp:fontconfig',
+            '../build/linux/system.gyp:x11',
+            '../dbus/dbus.gyp:dbus',
             '../third_party/libevent/libevent.gyp:libevent',
             '../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp:mozc_candidates_proto',
-            'browser/chromeos/input_method/input_method.gyp:gencode',
           ],
-          'sources!': [
-            'browser/background/background_mode_manager_gtk.cc',
-            'browser/extensions/default_apps.cc',
-            'browser/extensions/default_apps.h',
-            'browser/first_run/upgrade_util.cc',
-            'browser/first_run/upgrade_util.h',
-            'browser/first_run/upgrade_util_linux.cc',
-            'browser/icon_loader_linux.cc',
-            'browser/icon_manager_linux.cc',
-            'browser/idle_linux.cc',
-            'browser/password_manager/native_backend_gnome_x.cc',
-            'browser/password_manager/native_backend_gnome_x.h',
-            'browser/password_manager/native_backend_kwallet_x.cc',
-            'browser/password_manager/native_backend_kwallet_x.h',
-            'browser/platform_util_linux.cc',
-            'browser/printing/print_dialog_gtk.cc',
-            'browser/printing/print_dialog_gtk.h',
-            'browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc',
-            'browser/ui/gtk/tab_modal_confirm_dialog_gtk.h',
-            'browser/upgrade_detector_impl.cc',
-            'browser/upgrade_detector_impl.h',
+          'sources/': [
+            ['exclude', 'browser/extensions/default_apps.cc'],
+            ['exclude', 'browser/extensions/default_apps.h'],
+            ['exclude', 'browser/first_run/upgrade_util.cc'],
+            ['exclude', 'browser/first_run/upgrade_util.h'],
+            ['exclude', 'browser/first_run/upgrade_util_linux.cc'],
+            ['exclude', 'browser/icon_loader_linux.cc'],
+            ['exclude', 'browser/icon_manager_linux.cc'],
+            ['exclude', 'browser/idle_linux.cc'],
+            ['exclude', 'browser/password_manager/native_backend_gnome_x.cc'],
+            ['exclude', 'browser/password_manager/native_backend_gnome_x.h'],
+            ['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'],
+            ['exclude', 'browser/password_manager/native_backend_kwallet_x.h'],
+            ['exclude', 'browser/platform_util_linux.cc'],
+            ['exclude', 'browser/upgrade_detector_impl.cc'],
+            ['exclude', 'browser/upgrade_detector_impl.h'],
+            ['include', 'browser/chromeos/status/memory_menu_button.cc'],
+            ['include', 'browser/chromeos/status/memory_menu_button.h'],
           ],
         }],
         ['file_manager_extension==0', {
           'sources/': [
             ['exclude', 'browser/extensions/extension_file_browser_private_api.cc'],
             ['exclude', 'browser/extensions/extension_file_browser_private_api.h'],
             ['exclude', 'browser/extensions/extension_mediaplayer_private_api.cc'],
             ['exclude', 'browser/extensions/extension_mediaplayer_private_api.h'],
             ['exclude', 'browser/extensions/file_manager_util.h'],
             ['exclude', 'browser/extensions/file_manager_util.cc'],
@@ skipping 14 matching lines @@
             'browser/ui/gtk/gconf_titlebar_listener.cc',
             'browser/ui/gtk/gconf_titlebar_listener.h',
           ],
         }],
         ['use_gnome_keyring==0', {
           'sources!': [
             'browser/password_manager/native_backend_gnome_x.cc',
             'browser/password_manager/native_backend_gnome_x.h',
           ],
         }],
-        # linux/chromeos only status area button.
-        ['OS=="linux" and use_aura==1', {
-          'sources/': [
-            ['include', '^browser/chromeos/status/memory_menu_button.cc'],
-            ['include', '^browser/chromeos/status/memory_menu_button.h'],
-          ],
-        }],
         ['use_aura==1', {
           'sources/': [
             ['exclude', '^browser/aeropeek_manager.cc'],
             ['exclude', '^browser/automation/automation_provider_win.cc'],
             ['exclude', '^browser/automation/chrome_frame_automation_provider.cc'],
             ['exclude', '^browser/automation/chrome_frame_automation_provider.h'],
             ['exclude', '^browser/automation/testing_automation_provider_win.cc'],
             ['exclude', '^browser/chromeos/native_dialog_window.cc'],
             ['exclude', '^browser/chromeos/native_dialog_window.h'],
             ['exclude', '^browser/chromeos/frame/bubble_frame_view.h'],
@@ skipping 110 matching lines @@
                 '<(SHARED_INTERMEDIATE_DIR)',
                 '../breakpad/src',
               ],
             }, {  # linux_breakpad==0
               'sources': [
                 'browser/crash_handler_host_linux_stub.cc',
               ],
             }],
           ],
         }],
-        ['OS=="linux" and use_aura==1', {
-          'dependencies': [
-            '../build/linux/system.gyp:dbus',
-            '../build/linux/system.gyp:fontconfig',
-            '../build/linux/system.gyp:x11',
-            '../dbus/dbus.gyp:dbus',
-          ],
-        }],
         # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
         # native certificate viewers).
         ['os_posix == 0 or OS == "mac"', {
           'sources/': [
             ['exclude', '^browser/ui/webui/certificate_viewer_webui.cc'],
             ['exclude', '^browser/ui/webui/certificate_viewer_webui.h'],
             ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
             ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
           ],
         }],
@@ skipping 625 matching lines @@
               ],
             }],
             # These Views files have a GTK equivalent, so we cannot use both.
             ['toolkit_uses_gtk==1', {
               'sources/': [
                 ['exclude', '^browser/notifications/balloon_collection_views.cc'],
                 ['exclude', '^browser/ui/views/edit_search_engine_dialog.cc'],
                 ['exclude', '^browser/ui/views/edit_search_engine_dialog.h'],
               ],
             }],
-            # These GTK files haven't been ported to views, while ChromeOS has
-            # its own separate implementation below.  So re-include them only on
-            # non-ChromeOS views Linux builds.
-            ['OS=="linux" and toolkit_views==1 and chromeos==0', {
-              'sources/': [
-                ['exclude', '^browser/extensions/extension_file_browser_private_api'],
-                ['include', '^browser/ui/gtk/select_file_dialog_impl.cc'],
-                ['include', '^browser/ui/gtk/select_file_dialog_impl.h'],
-                ['include', '^browser/ui/gtk/select_file_dialog_impl_gtk.cc'],
-                ['include', '^browser/ui/gtk/select_file_dialog_impl_kde.cc'],
-                ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.cc'],
-                ['include', '^browser/ui/gtk/external_protocol_dialog_gtk.h'],
-                ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'],
-                ['include', '^browser/ui/views/notifications/balloon_view.cc'],
-                ['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 extension_input_ui_api that depends on chromeos again
             # (Required because of the '^browser/extensions/' include above)
             ['chromeos == 0 or use_virtual_keyboard == 0', {
               'sources/': [
                 ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
                 ['exclude', '^browser/extensions/extension_input_ui_api.h'],
               ],
             }],
-            # Include the chromeos status tray/icon only for non-aura builds.
-            ['OS=="linux" and toolkit_views==1 and chromeos==1 and use_aura==0', {
-              'sources/': [
-                ['include', '^browser/ui/views/status_icons/status_icon_chromeos.cc'],
-                ['include', '^browser/ui/views/status_icons/status_icon_chromeos.h'],
-                ['include', '^browser/ui/views/status_icons/status_tray_chromeos.cc'],
-                ['include', '^browser/ui/views/status_icons/status_tray_chromeos.h'],
-                ['exclude', '^browser/ui/views/status_icons/status_tray_linux.cc'],
-              ],
-            }],
             # Exclude file manager files again
             # (Required because of the '^browser/extensions/' include above)
             ['file_manager_extension==0', {
               'sources/': [
                 ['exclude', 'browser/extensions/extension_file_browser_private_api.cc'],
                 ['exclude', 'browser/extensions/extension_file_browser_private_api.h'],
                 ['exclude', 'browser/extensions/extension_mediaplayer_private_api.cc'],
                 ['exclude', 'browser/extensions/extension_mediaplayer_private_api.h'],
                 ['exclude', 'browser/extensions/file_manager_util.h'],
                 ['exclude', 'browser/extensions/file_manager_util.cc'],
@@ skipping 10 matching lines @@
                 ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.h'],
                 ['exclude', '^browser/ui/panels/panel_overflow_indicator_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_overflow_indicator_view.h'],
               ],
               'sources!': [
                 'browser/ui/toolbar/bookmark_sub_menu_model.cc',
               ],
             }],
-            ['chromeos==1 and use_aura==0', {
-              'sources/': [
-                ['exclude', '^browser/chromeos/legacy_window_manager/initial_browser_window_observer.cc'],
-                ['exclude', '^browser/chromeos/legacy_window_manager/initial_browser_window_observer.h'],
-                ['exclude', '^browser/chromeos/power/power_button_controller_delegate_chromeos.cc'],
-                ['exclude', '^browser/chromeos/power/power_button_controller_delegate_chromeos.h'],
-                ['exclude', '^browser/chromeos/power/power_button_observer.cc'],
-                ['exclude', '^browser/chromeos/power/power_button_observer.h'],
-                ['exclude', '^browser/chromeos/power/video_property_writer.cc'],
-                ['exclude', '^browser/chromeos/power/video_property_writer.h'],
-                ['exclude', '^browser/download/download_shelf.h'],
-                ['exclude', '^browser/notifications/balloon_collection_impl.cc'],
-                ['exclude', '^browser/notifications/balloon_collection_impl.h'],
-                ['exclude', '^browser/notifications/balloon_collection_views.cc'],
-                ['exclude', '^browser/ui/views/download/download_item_view.cc'],
-                ['exclude', '^browser/ui/views/download/download_item_view.h'],
-                ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.cc'],
-                ['exclude', '^browser/ui/views/download/download_shelf_context_menu_view.h'],
-                ['exclude', '^browser/ui/views/download/download_shelf_view.cc'],
-                ['exclude', '^browser/ui/views/download/download_shelf_view.h'],
-                ['include', '^browser/ui/webui/tab_modal_confirm_dialog_webui.cc'],
-                ['include', '^browser/ui/webui/tab_modal_confirm_dialog_webui.h'],
-              ],
-            }],
             ['chromeos==1',{
               'sources/': [
                 ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.cc'],
                 ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.h'],
                 ['include', '^browser/ui/gtk/simple_message_box_gtk.cc'],
                 ['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'],
                 ['include', '^browser/ui/views/omnibox/omnibox_view_views.h'],
                 ['exclude', '^browser/extensions/extension_tts_api_linux.cc'],
                 ['exclude', '^browser/notifications/balloon_collection_gtk.cc'],
               ],
@@ skipping 54 matching lines @@
             'browser/accessibility/browser_accessibility_manager_win.cc',
             'browser/accessibility/browser_accessibility_manager_win.h',
             'browser/accessibility/browser_accessibility_win.cc',
             'browser/accessibility/browser_accessibility_win.h',
             'browser/aeropeek_manager.cc',
             'browser/extensions/extension_tts_api_win.cc',
             'browser/google/google_update.cc',
             'browser/importer/ie_importer.cc',
           ],
         }],
-        # Must remove GTK files in PureViews case
-        ['use_aura==1 and OS=="linux"', {
+        # Build ChromeOS.
+        ['chromeos==1', {
           'sources/': [
+            ['exclude', '^browser/chromeos/frame/browser_view.cc'],
+            ['exclude', '^browser/chromeos/frame/browser_view.h'],
+            ['exclude', '^browser/chromeos/frame/panel_browser_view.cc'],
+            ['exclude', '^browser/chromeos/frame/panel_browser_view.h'],
+            ['exclude', '^browser/chromeos/frame/panel_controller.cc'],
+            ['exclude', '^browser/chromeos/frame/panel_controller.h'],
+            ['exclude', '^browser/chromeos/legacy_window_manager/wm_ipc.cc'],
+            ['exclude', '^browser/chromeos/legacy_window_manager/wm_message_listener.cc'],
+            ['exclude', '^browser/chromeos/login/background_view.cc'],
+            ['exclude', '^browser/chromeos/login/screen_locker_browsertest.cc'],
+            ['exclude', '^browser/chromeos/login/shutdown_button.cc'],
+            ['exclude', '^browser/chromeos/login/username_view.cc'],
+            ['exclude', '^browser/chromeos/login/user_view.cc'],
+            ['exclude', '^browser/chromeos/login/views_login_display.cc'],
+            ['exclude', '^browser/chromeos/login/views_login_display_host.cc'],
+            ['exclude', '^browser/chromeos/login/wizard_in_process_browser_test.cc'],
+            ['exclude', '^browser/chromeos/notifications/'],
             ['exclude', '^browser/google/google_update.cc'],
             ['exclude', '^browser/google/google_update.h'],
             ['exclude', '^browser/platform_util_common_linux.cc'],
+            ['exclude', '^browser/ui/webui/collected_cookies_ui_delegate.cc'],
+            ['exclude', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
+            ['include', '^browser/chromeos/notifications/balloon_collection_impl_aura.cc'],
+            ['include', '^browser/chromeos/notifications/balloon_collection_impl_aura.h'],
+            ['include', '^browser/chromeos/notifications/balloon_view_host.cc'],
+            ['include', '^browser/chromeos/notifications/balloon_view_host.h'],
+            ['include', '^browser/chromeos/notifications/system_notification.cc'],
+            ['include', '^browser/chromeos/notifications/system_notification_factory.cc'],
+            ['include', '^browser/chromeos/notifications/system_notification_factory.h'],
+            ['include', '^browser/chromeos/notifications/system_notification.h'],
             ['include', '^browser/ui/views/aura/'],
             ['include', '^browser/ui/views/bookmarks/bookmark_editor_view.cc'],
             ['include', '^browser/ui/views/bookmarks/bookmark_editor_view.h'],
             ['include', '^browser/ui/views/collected_cookies_views.cc'],
             ['include', '^browser/ui/views/collected_cookies_views.h'],
             ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
             ['include', '^browser/ui/views/constrained_window_views.cc'],
             ['include', '^browser/ui/views/cookie_info_view.cc'],
             ['include', '^browser/ui/views/cookie_info_view.h'],
             ['include', '^browser/ui/views/dropdown_bar_host_aura.cc'],
             ['include', '^browser/ui/views/find_bar_host_aura.cc'],
             ['include', '^browser/ui/views/first_run_bubble.cc'],
             ['include', '^browser/ui/views/frame/browser_frame_aura.cc'],
             ['include', '^browser/ui/views/frame/browser_non_client_frame_view_aura.cc'],
             ['include', '^browser/ui/views/frame/browser_non_client_frame_view_aura.h'],
             ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc'],
             ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'],
             ['include', '^browser/ui/views/native_constrained_window_aura.cc'],
             ['include', '^browser/ui/views/stubs_aura.cc'],
             ['include', '^browser/ui/views/tabs/tab_drag_controller2.cc'],
             ['include', '^browser/ui/views/tabs/tab_drag_controller2.h'],
+            ['include', '^browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc'],
             ['include', '^browser/ui/views/unhandled_keyboard_event_handler.cc'],
-            ['include', '^browser/ui/views/unhandled_keyboard_event_handler_aurax11.cc'],
-            ['exclude', '^browser/ui/webui/collected_cookies_ui_delegate.cc'],
-            ['exclude', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
-          ],
-        }],
-        # Build Aura with ChromeOS.
-        ['use_aura==1 and chromeos==1', {
-          'sources/': [
-            ['exclude', '^browser/chromeos/frame/panel_controller.cc'],
-            ['exclude', '^browser/chromeos/frame/panel_controller.h'],
-            ['exclude', '^browser/chromeos/frame/browser_view.cc'],
-            ['exclude', '^browser/chromeos/frame/browser_view.h'],
-            ['exclude', '^browser/chromeos/frame/panel_browser_view.cc'],
-            ['exclude', '^browser/chromeos/frame/panel_browser_view.h'],
-            ['exclude', '^browser/chromeos/legacy_window_manager/wm_ipc.cc'],
-            ['exclude', '^browser/chromeos/legacy_window_manager/wm_message_listener.cc'],
-            ['exclude', '^browser/chromeos/login/background_view.cc'],
-            ['exclude', '^browser/chromeos/login/screen_locker_browsertest.cc'],
-            ['exclude', '^browser/chromeos/login/shutdown_button.cc'],
-            ['exclude', '^browser/chromeos/login/username_view.cc'],
-            ['exclude', '^browser/chromeos/login/user_view.cc'],
-            ['exclude', '^browser/chromeos/login/views_login_display.cc'],
-            ['exclude', '^browser/chromeos/login/views_login_display_host.cc'],
-            ['exclude', '^browser/chromeos/login/wizard_in_process_browser_test.cc'],
-            ['exclude', '^browser/chromeos/notifications/'],
-            ['include', '^browser/chromeos/notifications/balloon_collection_impl_aura.cc'],
-            ['include', '^browser/chromeos/notifications/balloon_collection_impl_aura.h'],
-            ['include', '^browser/chromeos/notifications/balloon_view_host.cc'],
-            ['include', '^browser/chromeos/notifications/balloon_view_host.h'],
-            ['include', '^browser/chromeos/notifications/system_notification.cc'],
-            ['include', '^browser/chromeos/notifications/system_notification.h'],
-            ['include', '^browser/chromeos/notifications/system_notification_factory.cc'],
-            ['include', '^browser/chromeos/notifications/system_notification_factory.h'],
           ],
         }],
         ['use_aura==1', {
           'sources/': [
             ['include', '^browser/ui/views/tab_modal_confirm_dialog_views.cc'],
             ['include', '^browser/ui/views/tab_modal_confirm_dialog_views.h'],
           ],
         }],
         ['enable_plugin_installation==0', {
           'sources!': [
@@ skipping 102 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }