gyp: unify toolkit_views usage

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 2767 matching lines @@
             # Exclude parts of password_manager.
             ['exclude', '^browser/password_manager/ie7_password\\.cc$'],
 
             # Exclude all of rlz.
             ['exclude', '^browser/rlz/'],
 
             # Exclude all of views.
             ['exclude', '^browser/views/'],
           ],
           'conditions': [
-            ['OS=="linux" and (toolkit_views==1 or chromeos==1)',{
+            ['OS=="linux" and toolkit_views==1',{
               'dependencies': [
                 '../views/views.gyp:views',
               ],
               'include_dirs': [
                 '<(INTERMEDIATE_DIR)',
                 '<(INTERMEDIATE_DIR)/chrome',
               ],
               'sources/': [
                 ['exclude', '^browser/cookie_modal_dialog_views.cc'],
                 ['include', '^browser/back_forward_menu_model_views.cc'],
@@ skipping 271 matching lines @@
                 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'],
                 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'],
                 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk.cc'],
                 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk.h'],
                 ['exclude', '^browser/browser_list_gtk.cc'],
               ],
             }],
             # These GTK files haven't been ported to views, while ChromeOS has
             # its own separate implementation below.  So re-include them only on
             # non-ChromeOS views Linux builds.
-            ['OS=="linux" and chromeos==0 and toolkit_views==1', {
+            ['OS=="linux" and toolkit_views==1 and chromeos==0', {
               'sources/': [
                 ['include', '^browser/gtk/dialogs_gtk.cc'],
                 ['include', '^browser/gtk/external_protocol_dialog_gtk.cc'],
                 ['include', '^browser/gtk/external_protocol_dialog_gtk.h'],
                 ['include', '^browser/views/notifications/balloon_view.cc'],
                 ['include', '^browser/views/notifications/balloon_view.h'],
 
                 ['exclude', '^browser/views/select_file_dialog.cc'],
               ],
             }],
             # GTK build only
-            ['OS=="linux" and chromeos==0 and toolkit_views==0', {
+            ['OS=="linux" and toolkit_views==0', {
               'sources/': [
                 ['include', '^browser/printing/print_dialog_gtk.cc'],
                 ['include', '^browser/printing/print_dialog_gtk.h'],
                 ['exclude', '^browser/browser_list_stub.cc'],
                 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
                 ['exclude', '^browser/views/autocomplete/autocomplete_popup_gtk.cc'],
                 ['exclude', '^browser/views/autocomplete/autocomplete_popup_gtk.h'],
               ],
             }],
             ['OS=="linux" and chromeos==1',{
@@ skipping 198 matching lines @@
       ]
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: