First pass at chrome_browser gyp simplification.

build/common.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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 50 matching lines @@
             # well; such hosts should pass an explicit target_arch to gyp.
             'host_arch%':
               '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
           }],
 
           # Ash and ChromeOS require Aura.
           ['use_ash==1 or chromeos==1', {
             'use_aura%': 1,
           }],
 
-          # Set default value of toolkit_views based on OS.
+          # Set value of toolkit_views based on OS.
           ['OS=="win" or chromeos==1 or use_aura==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
           }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
@@ skipping 205 matching lines @@
         # NSS usage.
         ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_openssl==0', {
           'use_nss%': 1,
         }, {
           'use_nss%': 0,
         }],
 
         # Flags to use X11 on non-Mac POSIX platforms
         ['OS=="win" or OS=="mac" or OS=="android"', {
           'use_glib%': 0,
-          'toolkit_uses_gtk%': 0,
           'use_x11%': 0,
         }, {
-          # TODO(dnicoara) Wayland build should have these disabled, but

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

I think this note still applies to use_glib and use_x11.

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

Done.

-          # currently GTK and X is too spread and it's hard to completely
-          # remove every dependency.
           'use_glib%': 1,
-          'toolkit_uses_gtk%': 1,
           'use_x11%': 1,
         }],
+
+        # Aura and most platforms never use GTK. 
+        ['use_aura==1 or OS=="win" or OS=="mac" or OS=="android"', {
+          'toolkit_uses_gtk%': 0,
+        }, {
+          'toolkit_uses_gtk%': 1,
+        }],
+
         # We always use skia text rendering in Aura on Windows, since GDI
         # doesn't agree with our BackingStore.
         # TODO(beng): remove once skia text rendering is on by default.
         ['use_aura==1 and OS=="win"', {
           'enable_skia_text%': 1,
         }],
-        ['use_aura==1 and OS!="win"', {
-          'toolkit_uses_gtk%': 0,
-        }],
 
         # A flag to enable or disable our compile-time dependency
         # on gnome-keyring. If that dependency is disabled, no gnome-keyring
         # support will be available. This option is useful
-        # for Linux distributions and for Aura.

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

I'd put this part of the comment back. It is useful for say, Gentoo, to in the
support for GNOME keyring if they want.

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

Done.

-        ['chromeos==1 or use_aura==1', {
+        # for Aura.
+        ['use_aura==1', {
           'use_gnome_keyring%': 0,
         }, {
           'use_gnome_keyring%': 1,
         }],
 
         ['toolkit_views==0 or OS=="mac"', {
           # GTK+ and Mac wants Title Case strings
           'use_titlecase_in_grd_files%': 1,
         }],
 
         # Enable some hacks to support Flapper only on Chrome OS.
+        # Enable file manager extension on ChromeOS.
         ['chromeos==1', {
           'enable_flapper_hacks%': 1,
+          'file_manager_extension%': 1,
         }, {
           'enable_flapper_hacks%': 0,
-        }],
-
-        # Enable file manager extension on Chrome OS or Aura.
-        ['chromeos==1 or use_aura==1', {
-          'file_manager_extension%': 1,
-        }, {
           'file_manager_extension%': 0,
         }],
 
-        # ... except on Windows even with Aura.
-        ['use_aura==1 and OS=="win"', {
-          'file_manager_extension%': 0,
-        }],
-
-        # Enable WebUI TaskManager on Chrome OS or Aura.
-        ['chromeos==1 or use_aura==1', {
+        # Enable WebUI TaskManager on Aura.
+        ['use_aura==1', {
           'webui_task_manager%': 1,
         }],
 
         ['OS=="android"', {
           'proprietary_codecs%': 1,
           'enable_webrtc%': 0,
         }],
 
         # Use GPU accelerated cross process image transport by default
         # on linux builds with the Aura window manager
         ['use_aura==1 and OS=="linux"', {
           'ui_compositor_image_transport%': 1,
         }, {
           'ui_compositor_image_transport%': 0,
         }],
 
         # Turn precompiled headers on by default for VS 2010.
         ['OS=="win" and MSVS_VERSION=="2010"', {
           'chromium_win_pch%': 1
         }],
 
-        ['use_aura==1 or chromeos==1', {
+        # No plugin installation allowed under Aura.
+        ['use_aura==1', {
           'enable_plugin_installation%': 0,
         }, {
           'enable_plugin_installation%': 1,
         }],
 
         # Set to 0 to not use third_party/gold as the linker.
         # On by default for x64 Linux.  Off for ChromeOS as cross-compiling
         # makes things complicated.
         ['chromeos==0 and host_arch=="x64"', {
           'linux_use_gold_binary%': 1,
@@ skipping 2376 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }