Revert 120106 - Cleanup: Merge some OS specific sections in chrome/*.gypi.

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 4211 matching lines @@
             'browser/nacl_host/nacl_process_host.h',
           ],
           'dependencies': [
             '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
           ],
         }],
         ['branding=="Chrome"', {
           'sources!': [
             'browser/protector/keys.cc',
           ],
-        }, {  # branding!="Chrome"
+        }],
+        ['branding!="Chrome"', {
           'sources!': [
             'browser/protector/internal/keys_internal.cc',
           ],
         }],
         ['debug_devtools==1', {
           'defines': [
             'DEBUG_DEVTOOLS=1',
           ],
         }],
         ['configuration_policy==0', {
@@ skipping 57 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==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus-glib',
             '../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',
@@ skipping 43 matching lines @@
           ],
         }],
         ['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', {
-          'dependencies': [
-            '../build/linux/system.gyp:dbus',
-            '../build/linux/system.gyp:fontconfig',
-            '../build/linux/system.gyp:x11',
-            '../dbus/dbus.gyp:dbus',
-          ],
           'sources/': [
-            # Must remove GTK files in PureViews case
-            ['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/status/memory_menu_button.cc'],
             ['include', '^browser/chromeos/status/memory_menu_button.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'],
           ],
         }],
         ['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'],
@@ skipping 111 matching lines @@
                 # breakpad_linux.cc uses generated file_version_info_linux.h.
                 '<(SHARED_INTERMEDIATE_DIR)',
                 '../breakpad/src',
               ],
             }, {  # linux_breakpad==0
               'sources': [
                 'browser/crash_handler_host_linux_stub.cc',
               ],
             }],
           ],
-        }, {  # os_posix == 0 or OS == "mac"'
-          # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
-          # native certificate viewers).
+        }],
+        ['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'],
           ],
         }],
         ['use_nss==1', {
           'sources': [
             'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
@@ skipping 789 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"', {
+          'sources/': [
+            ['exclude', '^browser/google/google_update.cc'],
+            ['exclude', '^browser/google/google_update.h'],
+            ['exclude', '^browser/platform_util_common_linux.cc'],
+            ['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.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'],
@@ skipping 124 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' ]
     },
   ],
 }