Fix the toolkit_views gyp variable define mania.

build/common.gypi

 # Copyright (c) 2010 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': {
     # .gyp files or targets should set chromium_code to 1 if they build
@@ skipping 30 matching lines @@
           [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
             # This handles the Linux platforms we generally deal with. Anything
             # else gets passed through, which probably won't work very 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/")',
           }, {  # OS!="linux"
             'host_arch%': 'ia32',
           }],
         ],
+
+        # Whether we're building a ChromeOS build.
+        # We set the initial value at this level of nesting so it's available for

[Evan Martin, 2010/04/26 22:06:59]

will fix before landing

+        # the toolkit_views test below.
+        'chromeos%': '0',
       },
+
+      # Set default value of toolkit_views on for Windows and Chrome OS.
+      # We set it at this level of nesting so the value is available for
+      # other conditionals below.
+      'conditions': [
+        ['OS=="win" or chromeos==1', {
+          'toolkit_views%': 1,
+        }, {
+          'toolkit_views%': 0,
+        }],
+      ],
+
       'host_arch%': '<(host_arch)',
 
       # Default architecture we're building for is the architecture we're
       # building on.
       'target_arch%': '<(host_arch)',
 
       # We do want to build Chromium with Breakpad support in certain
       # situations. I.e. for Chrome bot.
       'linux_chromium_breakpad%': 0,
       # And if we want to dump symbols.
       'linux_chromium_dump_symbols%': 0,
       # Also see linux_strip_binary below.
 
-      # By default, Linux does not use views. To turn on views in Linux,
-      # set the variable GYP_DEFINES to "toolkit_views=1", or modify
-      # ~/.gyp/include.gypi .
-      'toolkit_views%': 0,
-
-      # Defaults to a desktop build, overridden via command line/env.
-      'chromeos%': 0,
+      # Copy conditionally-set chromeos variable out one scope.
+      'chromeos%': '<(chromeos)',
 
       # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are
       # are built under a chromium full build (1) or a webkit.org chromium
       # build (0).
       'inside_chromium_build%': 1,
 
       # Set to 1 to enable fast builds. It disables debug info for fastest
       # compilation.
       'fastbuild%': 0,
 
@@ skipping 1197 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: