gyp: unify toolkit_views usage

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 250 matching lines @@
           # symbols from official builds.
           # TODO(mmoss) dump_syms segfaults on x64. Enable once dump_syms and
           # crash server handle 64-bit symbols.
           ['linux_chromium_dump_symbols==1 or '
            '(branding=="Chrome" and buildtype=="Official" and '
            'target_arch=="ia32")', {
             'linux_dump_symbols%': 1,
           }, {
             'linux_dump_symbols%': 0,
           }],
-          ['toolkit_views==0 and chromeos==0', {
+          ['toolkit_views==0', {
             # GTK wants Title Case strings
             'use_titlecase_in_grd_files%': 1,
           }],
         ],
       }],  # OS=="linux" or OS=="freebsd" or OS=="openbsd"
       ['OS=="mac"', {
         # Mac wants Title Case strings
         'use_titlecase_in_grd_files%': 1,
         'conditions': [
           # mac_product_name is set to the name of the .app bundle as it should
@@ skipping 99 matching lines @@
       'release_extra_cflags%': '',
       'debug_extra_cflags%': '',
       'release_valgrind_build%': 0,
     },
     'conditions': [
       ['branding=="Chrome"', {
         'defines': ['GOOGLE_CHROME_BUILD'],
       }, {  # else: branding!="Chrome"
         'defines': ['CHROMIUM_BUILD'],
       }],
-      ['toolkit_views==1 or chromeos==1', {
+      ['toolkit_views==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
       ['chromeos==1', {
         'defines': ['OS_CHROMEOS=1'],
       }],
       ['fastbuild!=0', {
         'conditions': [
           # Finally, for Windows, we simply turn on profiling.
           ['OS=="win"', {
             'msvs_settings': {
@@ skipping 136 matching lines @@
             'sources/': [ ['exclude', '_posix\\.cc$'] ],
           }],
           # Though Skia is conceptually shared by Linux and Windows,
           # the only _skia files in our tree are Linux-specific.
           ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
             'sources/': [ ['exclude', '_skia\\.cc$'] ],
           }],
           ['chromeos!=1', {
             'sources/': [ ['exclude', '_chromeos\\.cc$'] ]
           }],
-          ['OS!="win" and (toolkit_views==0 and chromeos==0)', {
+          ['toolkit_views==0', {
             'sources/': [ ['exclude', '_views\\.cc$'] ]
           }],
         ],
       }],
     ],  # target_conditions for 'target_defaults'
     'default_configuration': 'Debug',
     'configurations': {
       # VCLinkerTool LinkIncremental values below:
       #   0 == default
       #   1 == /INCREMENTAL:NO
@@ skipping 357 matching lines @@
             # compiler optimized the code, since the value is always kept
             # in its specified precision.
             'conditions': [
               ['branding=="Chromium"', {
                 'cflags': [
                   '-march=pentium4',
                   '-msse2',
                   '-mfpmath=sse',
                 ],
               }],
-              # ChromeOS targets Pinetrail, which is ssse3, but most of the
+              # ChromeOS targets Pinetrail, which is sse3, but most of the
               # benefit comes from sse2 so this setting allows ChromeOS
               # to build on other CPUs.  In the future -march=atom would help
               # but requires a newer compiler.
               ['chromeos==1', {
                 'cflags': [
                   '-msse2',
                 ],
               }],
             ],
             # -mmmx allows mmintrin.h to be used for mmx intrinsics.
@@ skipping 368 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: