remove chromeos dependency from linux_view

chrome/chrome_browser.gypi

 # Copyright (c) 2009 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 1829 matching lines @@
 
         # This file is generated by GRIT.
         '<(grit_out_dir)/grit/theme_resources_map.cc',
       ],
       'conditions': [
         ['javascript_engine=="v8"', {
           'defines': [
             'CHROME_V8',
           ],
         }],
-        ['chromeos==1 and toolkit_views==0', {
-          'sources/': [
-            ['exclude', '^browser/chromeos/browser_extenders.cc'],
-            ['exclude', '^browser/gtk/external_protocol_dialog_gtk.cc'],
-            ['exclude', '^browser/gtk/external_protocol_dialog_gtk.h'],
-           ],
-        }],
-        ['chromeos==0 and toolkit_views==0', {
+        ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             # Temporarily disabled while we figure some stuff out.
             # http://code.google.com/p/chromium/issues/detail?id=12351
             # '../build/linux/system.gyp:dbus-glib',
             # '../build/linux/system.gyp:gnome-keyring',
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:nss',
             '../base/base.gyp:linux_versioninfo',
           ],
           'sources!': [
+             # Exclude extension shelf for toolstrips.
             'browser/views/extensions/extension_shelf.cc',
             'browser/views/extensions/extension_shelf.h',
             'browser/views/extensions/extension_view.cc',
             'browser/views/extensions/extension_view.h',
-                    # Windows-specific files.
+             # Windows-specific files.
             'browser/password_manager/password_store_win.cc',
             'browser/password_manager/password_store_win.h',
           ],
           'sources': [
             'browser/crash_handler_host_linux.h',
             'browser/net/ssl_config_service_manager_pref.cc',
           ],
           'sources/': [
             # Exclude most of printing.
             ['exclude', '^browser/printing/'],
@@ skipping 14 matching lines @@
                 '<(SHARED_INTERMEDIATE_DIR)',
                 '../breakpad/src',
               ],
             }, {  # linux_breakpad==0
               'sources': [
                 'browser/crash_handler_host_linux_stub.cc',
               ],
             }],
           ],
         }],
-        ['OS=="linux" and toolkit_views==0', {
-          'sources!': [
-            'browser/bookmarks/bookmark_drop_info.cc',
-            'browser/views/autocomplete/autocomplete_popup_gtk.cc',
-            'browser/views/autocomplete/autocomplete_popup_gtk.h'
-          ],
-        }],
         ['OS=="freebsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
           ],
         }],
         ['OS=="mac"', {
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
             'browser/bookmarks/bookmark_context_menu.cc',
@@ skipping 177 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': [
-            ['toolkit_views==1',{
+            ['OS=="linux" and (toolkit_views==1 or chromeos==1)',{
               'sources/': [
                 ['include', '^browser/dock_info_gtk.cc'],
                 ['include', '^browser/dock_info.cc'],
                 ['include', '^browser/dock_info.h'],
                 ['include', '^browser/extensions/'],
                 ['include', '^browser/views/accelerator_table_gtk.cc'],
                 ['include', '^browser/views/accelerator_table_gtk.h'],
                 ['include', '^browser/views/accessible_toolbar_view.cc'],
                 ['include', '^browser/views/accessible_toolbar_view.h'],
                 ['include', '^browser/views/autocomplete/autocomplete_popup_contents_view.cc'],
@@ skipping 191 matching lines @@
                 ['exclude', '^browser/extensions/extension_host_mac.mm'],
                 ['exclude', '^browser/extensions/external_registry_extension_provider_win.cc'],
                 ['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'],
                 # Overlaps with browser/views/frame/browser_view.cc
                 ['exclude', '^browser/browser_list_gtk.cc'],
               ],
             }],
-            ['OS=="linux" and toolkit_views==0', {
+            ['OS=="linux" and toolkit_views==1', {
+              'sources/': [
+                ['include', '^browser/views/frame/standard_extender.h'],
+                ['include', '^browser/views/frame/standard_extender.cc'],
+                ['include', '^browser/gtk/external_protocol_dialog_gtk.cc'],
+                ['include', '^browser/gtk/external_protocol_dialog_gtk.h'],
+              ],
+            }],
+            ['OS=="linux" and chromeos==0 and toolkit_views==0', {
               'sources/': [
                 ['include', '^browser/printing/print_dialog_gtk.cc'],
                 ['include', '^browser/printing/print_dialog_gtk.h'],
+                ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
+                ['exclude', '^browser/views/autocomplete/autocomplete_popup_gtk.cc'],
+                ['exclude', '^browser/views/autocomplete/autocomplete_popup_gtk.h'],
               ],
             }],
-            ['chromeos==1 or toolkit_views==1',{
+            ['OS=="linux" and (chromeos==1 or toolkit_views==1)',{
               'dependencies': [
-                '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
-                '../third_party/protobuf2/protobuf.gyp:protoc#host',
-                '../third_party/chromeos_login_manager/chromeos_login_manager/chromeos_login_manager.gyp:session',
-                '../third_party/chromeos_login_manager/chromeos_login_manager/chromeos_login_manager.gyp:emit_login_prompt_ready',
-                'browser/chromeos/cros_api.gyp:cros_api',
                 '../views/views.gyp:views',
               ],
-              'actions': [
-                {
-                  'action_name': 'my_proto',
-                  'inputs': [
-                    '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-                    'browser/metrics/system_metrics.proto',
-                  ],
-                  'outputs': [
-                    '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.cc',
-                    '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.h',
-                  ],
-                  'dependencies': [
-                    '../third_party/protobuf2/protobuf.gyp:protoc',
-                  ],
-                  'action': [
-                    '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-                    'browser/metrics/system_metrics.proto',
-                    '--cpp_out=<(INTERMEDIATE_DIR)/chrome',
-                  ],
-                },
-              ],
               'include_dirs': [
                 '<(INTERMEDIATE_DIR)',
                 '<(INTERMEDIATE_DIR)/chrome',
               ],
               'sources/': [
                 ['include', 'browser/back_forward_menu_model_views.cc'],
                 ['include', 'browser/back_forward_menu_model_views.h'],
                 ['exclude', 'browser/gtk/about_chrome_dialog.cc'],
                 ['exclude', 'browser/gtk/about_chrome_dialog.h'],
                 ['include', 'browser/views/about_chrome_view.cc'],
@@ skipping 23 matching lines @@
                 ['include', 'browser/views/tabs/tab_overview_drag_controller.cc'],
                 ['include', 'browser/views/tabs/tab_overview_drag_controller.h'],
                 ['include', 'browser/views/tabs/tab_overview_grid.cc'],
                 ['include', 'browser/views/tabs/tab_overview_grid.h'],
                 ['include', 'browser/views/tabs/tab_overview_message_listener.cc'],
                 ['include', 'browser/views/tabs/tab_overview_message_listener.h'],
                 ['include', 'browser/views/tabs/tab_overview_types.cc'],
                 ['include', 'browser/views/tabs/tab_overview_types.h'],
               ],
             }],
+            ['OS=="linux" and chromeos==1',{
+              'dependencies': [
+
+                '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
+                '../third_party/protobuf2/protobuf.gyp:protoc#host',
+                '../third_party/chromeos_login_manager/chromeos_login_manager/chromeos_login_manager.gyp:session',
+                '../third_party/chromeos_login_manager/chromeos_login_manager/chromeos_login_manager.gyp:emit_login_prompt_ready',
+                '../third_party/cros/cros_api.gyp:cros_api',
+              ],
+              'actions': [
+                {
+                  'action_name': 'my_proto',
+                  'inputs': [
+                    '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
+                    'browser/metrics/system_metrics.proto',
+                  ],
+                  'outputs': [
+                    '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.cc',
+                    '<(INTERMEDIATE_DIR)/chrome/browser/metrics/system_metrics.pb.h',
+                  ],
+                  'dependencies': [
+                    '../third_party/protobuf2/protobuf.gyp:protoc',
+                  ],
+                  'action': [
+                    '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
+                    'browser/metrics/system_metrics.proto',
+                    '--cpp_out=<(INTERMEDIATE_DIR)/chrome',
+                  ],
+                },
+              ],
+            }],
           ],
           # Exclude files that should be excluded for all non-Windows platforms.
           'sources!': [
             'browser/autocomplete/autocomplete_accessibility.cc',
             'browser/bookmarks/bookmark_menu_controller.cc',
             'browser/bookmarks/bookmark_menu_controller.h',
             'browser/browser_accessibility.cc',
             'browser/browser_accessibility_manager.cc',
             'browser/external_tab_container.cc',
             'browser/google_update.cc',
             'browser/history/history_indexer.idl',
             'browser/history_tab_ui.cc',
             'browser/history_view.cc',
             'browser/ime_input.cc',
             'browser/importer/ie_importer.cc',
             'browser/jumplist.cc',
             'browser/sandbox_policy.cc',
           ],
         }],
         # views depends on webkit headers.
-        ['OS=="win" or toolkit_views==1',{
+        ['OS=="win" or chromeos==1 or toolkit_views==1',{
           'dependencies': [
             '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
           ],
         }],
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: