Change chromeos build to use views

BUG=None
TEST=None

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

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

common.gypi

@@ -224,7 +224,7 @@
           }, {
             'linux_dump_symbols%': 0,
           }],
-          ['toolkit_views==0', {
+          ['toolkit_views==0 and chromeos==0', {
             # GTK wants Title Case strings
             'use_titlecase_in_grd_files%': 1,
           }],
@@ -318,12 +318,9 @@
       ['chrome_frame_define', {
         'defines': ['CHROME_FRAME_BUILD'],
       }],
-      ['toolkit_views==1', {
+      ['toolkit_views==1 or chromeos==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
-      ['chromeos==1', {
-        'defines': ['CHROMEOS_TRANSITIONAL=1'],
-      }],
       ['chromeos==1 or toolkit_views==1', {
         'defines': ['OS_CHROMEOS=1'],
       }],
@@ -1067,7 +1064,7 @@
           ['chromeos!=1', {
             'sources/': [ ['exclude', '_chromeos\\.cc$'] ]
           }],
-          ['OS!="win" and toolkit_views!=1', {
+          ['OS!="win" and (toolkit_views==0 and chromeos==0)', {
             'sources/': [ ['exclude', '_views\\.cc$'] ]
           }],
         ],