gyp: unify toolkit_views usage

Now that we can rely on toolkit_views to be set when appropriate,
we can simplify a bunch of logic in gyp.

TEST=compiles

Review URL: http://codereview.chromium.org/1741010

git-svn-id: http://src.chromium.org/svn/trunk/src/build@45727 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all.gyp

@@ -107,7 +107,7 @@
             '../third_party/libevent/libevent.gyp:*',
           ],
         }],
-        ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
+        ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:*',
           ],

common.gypi

@@ -268,7 +268,7 @@
           }, {
             'linux_dump_symbols%': 0,
           }],
-          ['toolkit_views==0 and chromeos==0', {
+          ['toolkit_views==0', {
             # GTK wants Title Case strings
             'use_titlecase_in_grd_files%': 1,
           }],
@@ -388,7 +388,7 @@
       }, {  # else: branding!="Chrome"
         'defines': ['CHROMIUM_BUILD'],
       }],
-      ['toolkit_views==1 or chromeos==1', {
+      ['toolkit_views==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
       ['chromeos==1', {
@@ -545,7 +545,7 @@
           ['chromeos!=1', {
             'sources/': [ ['exclude', '_chromeos\\.cc$'] ]
           }],
-          ['OS!="win" and (toolkit_views==0 and chromeos==0)', {
+          ['toolkit_views==0', {
             'sources/': [ ['exclude', '_views\\.cc$'] ]
           }],
         ],
@@ -923,7 +923,7 @@
                   '-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.