First cut at creating a refactored version of tab_contents_views. This is

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 3380 matching lines @@
         'browser/ui/views/status_bubble_views.h',
         'browser/ui/views/status_icons/status_icon_win.cc',
         'browser/ui/views/status_icons/status_icon_win.h',
         'browser/ui/views/status_icons/status_tray_gtk.cc',
         'browser/ui/views/status_icons/status_tray_win.cc',
         'browser/ui/views/status_icons/status_tray_win.h',
         'browser/ui/views/tab_icon_view.cc',
         'browser/ui/views/tab_icon_view.h',
         'browser/ui/views/tab_contents/tab_contents_container.cc',
         'browser/ui/views/tab_contents/tab_contents_container.h',
+        'browser/ui/views/tab_contents/tab_contents_container_native.cc',
+        'browser/ui/views/tab_contents/tab_contents_container_native.h',
+        'browser/ui/views/tab_contents/tab_contents_container_views.cc',
+        'browser/ui/views/tab_contents/tab_contents_container_views.h',
         'browser/ui/views/tab_contents/native_tab_contents_container.h',
         'browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc',
         'browser/ui/views/tab_contents/native_tab_contents_container_gtk.h',
         'browser/ui/views/tab_contents/native_tab_contents_container_win.cc',
         'browser/ui/views/tab_contents/native_tab_contents_container_win.h',
         'browser/ui/views/tab_contents/render_view_context_menu_views.cc',
         'browser/ui/views/tab_contents/render_view_context_menu_views.h',
         'browser/ui/views/tab_contents/tab_contents_drag_win.cc',
         'browser/ui/views/tab_contents/tab_contents_drag_win.h',
         'browser/ui/views/tab_contents/tab_contents_view_gtk.cc',
@@ skipping 152 matching lines @@
             'browser/password_manager/native_backend_gnome_x.h',
             'browser/password_manager/native_backend_gnome_x.cc',
           ],
         }],
         ['touchui==0', {
           'sources/': [
             ['exclude', '^browser/chromeos/dom_ui/login/'],
             ['exclude', '^browser/dom_ui/keyboard_ui.*'],
             ['exclude', '^browser/renderer_host/render_widget_host_view_views.*'],
             ['exclude', '^browser/ui/touch/*'],
+            ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'],
+            ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_views.h'],
             ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_views.*'],
           ],
         }],
         ['touchui==1', {

[sky, 2011/01/05 16:43:03]

Can this section be merged into the section on line 4285?

[Alex Nicolaou, 2011/01/06 09:37:17]

Maybe but I don't think so. Can we follow up on this in a separate CL? Also
these diffs look wrong, I'll have to look at how I made my patch, only the lines
above about tab_contents_container_* are relevant.

[sky, 2011/01/06 16:01:16]

Sure. Please file a bug so we don't forget it.

[Alex Nicolaou, 2011/01/12 18:51:14]

OK so I spent a minute to figure out why this is as it is. These
includes/excludes go with the generic views includes/excludes immediately above
here in the file, while the ones on line 4285 apply to the linux-specific
includes/excludes later in the file. I can't comment on why the pre-existing
views rules are coded this way in the gyp file, but I don't want to embark on
merging the two (large) views sections into one section, and these lines
logically belong near the rules that they override in my view. So I'd prefer to
change nothing, because moving these lines lower will obscure what they do/when
they apply, and merging the big sections is a lot more work.

Is that OK?

[sky, 2011/01/12 19:06:53]

Yes, that's fine.

           'sources/': [
             ['include', 'browser/chromeos/dom_ui/login/authenticator_facade.h'],
             ['include', 'browser/chromeos/dom_ui/login/authenticator_facade_cros.cc'],
             ['include', 'browser/chromeos/dom_ui/login/authenticator_facade_cros.h'],
             ['include', 'browser/chromeos/dom_ui/login/authenticator_facade_stub.cc'],
             ['include', 'browser/chromeos/dom_ui/login/authenticator_facade_stub.h'],
             ['include', 'browser/chromeos/dom_ui/login/login_ui.cc'],
             ['include', 'browser/chromeos/dom_ui/login/login_ui.h'],
             ['include', 'browser/chromeos/dom_ui/login/login_ui_helpers.cc'],
             ['include', 'browser/chromeos/dom_ui/login/login_ui_helpers.h'],
             ['include', '^browser/ui/touch/*'],
             ['exclude', '^browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc'],
+            ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
+            ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
             ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
             ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
-            ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
-            ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
             ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
             ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.cc'],
             ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:dbus-glib',
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gtk',
@@ skipping 490 matching lines @@
                 ['include', '^browser/ui/views/select_file_dialog.cc'],
                 ['include', '^browser/ui/views/status_bubble_views.cc'],
                 ['include', '^browser/ui/views/status_bubble_views.h'],
                 ['include', '^browser/ui/views/status_icons/status_tray_gtk.cc'],
                 ['include', '^browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc'],
                 ['include', '^browser/ui/views/tab_contents/native_tab_contents_container_gtk.h'],
                 ['include', '^browser/ui/views/tab_contents/render_view_context_menu_views.cc'],
                 ['include', '^browser/ui/views/tab_contents/render_view_context_menu_views.h'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_container.cc'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_container.h'],
+                ['include', '^browser/ui/views/tab_contents/tab_contents_container_native.cc'],
+                ['include', '^browser/ui/views/tab_contents/tab_contents_container_native.h'],
+                ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'],
+                ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.h'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_view_gtk.cc'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_view_gtk.h'],
                 ['include', '^browser/ui/views/tab_icon_view.cc'],
                 ['include', '^browser/ui/views/tab_icon_view.h'],
                 ['include', '^browser/ui/views/tabs/base_tab.cc'],
                 ['include', '^browser/ui/views/tabs/base_tab.h'],
                 ['include', '^browser/ui/views/tabs/base_tab_strip.cc'],
                 ['include', '^browser/ui/views/tabs/base_tab_strip.h'],
                 ['include', '^browser/ui/views/tabs/browser_tab_strip_controller.cc'],
                 ['include', '^browser/ui/views/tabs/browser_tab_strip_controller.h'],
@@ skipping 162 matching lines @@
             ['OS=="linux" and toolkit_views==1 and touchui==1', {
               'sources/': [
                 ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.cc'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.h'],
                 ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
                 ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.cc'],
                 ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.h'],
                 # TODO(anicolao): exclude these once we have DOMUI dialogs
                 # ['exclude', '^browser/gtk/constrained_window_gtk.cc'],
                 # ['exclude', '^browser/gtk/constrained_window_gtk.h'],
+                ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_native.cc'],
+                ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_native.h'],
               ],
             }],
             ['OS=="linux" and chromeos==1',{
               'sources/': [
                 ['exclude', '^browser/extensions/extension_tts_api_linux.cc'],
                 ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'],
                 ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'],
                 ['exclude', '^browser/notifications/balloon_collection.cc'],
                 ['exclude', '^browser/notifications/balloon_collection_impl.h'],
                 ['exclude', '^browser/notifications/balloon_collection_linux.cc'],
@@ skipping 230 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: