Re-land:

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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 392 matching lines @@
         'browser/chromeos/customization_document.h',
         'browser/chromeos/drop_shadow_label.cc',
         'browser/chromeos/enterprise_extension_observer.cc',
         'browser/chromeos/enterprise_extension_observer.h',
         'browser/chromeos/extensions/file_browser_event_router.cc',
         'browser/chromeos/extensions/file_browser_event_router.h',
         'browser/chromeos/external_metrics.cc',
         'browser/chromeos/external_metrics.h',
         'browser/chromeos/external_protocol_dialog.cc',
         'browser/chromeos/external_protocol_dialog.h',
-        'browser/chromeos/frame/browser_frame_chromeos.cc',
-        'browser/chromeos/frame/browser_frame_chromeos.h',
         'browser/chromeos/frame/browser_frame_view_chromeos.cc',
         'browser/chromeos/frame/browser_frame_view_chromeos.h',
         'browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc',
         'browser/chromeos/frame/browser_view.cc',
         'browser/chromeos/frame/browser_view.h',
         'browser/chromeos/frame/bubble_frame_view.cc',
         'browser/chromeos/frame/bubble_frame_view.h',
         'browser/chromeos/frame/bubble_window.cc',
         'browser/chromeos/frame/bubble_window.h',
         'browser/chromeos/frame/dom_browser.cc',
@@ skipping 2439 matching lines @@
         'browser/ui/views/accelerator_table_gtk.cc',
         'browser/ui/views/accelerator_table_gtk.h',
         'browser/ui/views/accessibility_event_router_views.cc',
         'browser/ui/views/accessibility_event_router_views.h',
         'browser/ui/views/accessible_pane_view.cc',
         'browser/ui/views/accessible_pane_view.h',
         'browser/ui/views/appcache_info_view.cc',
         'browser/ui/views/appcache_info_view.h',
         'browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc',
         'browser/ui/views/autocomplete/autocomplete_popup_contents_view.h',
-        'browser/ui/views/autocomplete/autocomplete_popup_gtk.cc',
-        'browser/ui/views/autocomplete/autocomplete_popup_gtk.h',
-        'browser/ui/views/autocomplete/autocomplete_popup_win.cc',
-        'browser/ui/views/autocomplete/autocomplete_popup_win.h',
         'browser/ui/views/autocomplete/autocomplete_result_view.cc',
         'browser/ui/views/autocomplete/autocomplete_result_view.h',
         'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc',
         'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h',
         'browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc',
         'browser/ui/views/bookmarks/bookmark_bar_instructions_view.h',
         'browser/ui/views/bookmarks/bookmark_bar_view.cc',
         'browser/ui/views/bookmarks/bookmark_bar_view.h',
         'browser/ui/views/bookmarks/bookmark_bubble_view.cc',
         'browser/ui/views/bookmarks/bookmark_bubble_view.h',
@@ skipping 242 matching lines @@
         '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_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/native_tab_contents_view.h',
         'browser/ui/views/tab_contents/native_tab_contents_view_delegate.h',
+        'browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc',
+        'browser/ui/views/tab_contents/native_tab_contents_view_gtk.h',
         'browser/ui/views/tab_contents/native_tab_contents_view_win.cc',
         'browser/ui/views/tab_contents/native_tab_contents_view_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_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/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',
-        'browser/ui/views/tab_contents/tab_contents_view_gtk.h',
         'browser/ui/views/tab_contents/tab_contents_view_touch.cc',
         'browser/ui/views/tab_contents/tab_contents_view_touch.h',
         'browser/ui/views/tab_contents/tab_contents_view_views.cc',
         'browser/ui/views/tab_contents/tab_contents_view_views.h',
         'browser/ui/views/tab_icon_view.cc',
         'browser/ui/views/tab_icon_view.h',
         'browser/ui/views/tabs/abstract_tab_strip_view.h',
         'browser/ui/views/tabs/base_tab.cc',
         'browser/ui/views/tabs/base_tab.h',
         'browser/ui/views/tabs/base_tab_strip.cc',
@@ skipping 399 matching lines @@
         ['touchui==1', {
           'sources/': [
             ['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/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
             ['exclude', '^browser/ui/views/handle_web_keyboard_event_gtk.cc'],
-            ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.cc'],
-            ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
             ['exclude', '^browser/chromeos/input_method/candidate_window.cc'],
             ['exclude', '^browser/chromeos/input_method/candidate_window.h'],
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:dbus-glib',
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
@@ skipping 554 matching lines @@
                 ['include', '^browser/ui/views/restart_message_box.cc'],
                 ['include', '^browser/ui/views/restart_message_box.h'],
                 ['include', '^browser/ui/views/sad_tab_view.cc'],
                 ['include', '^browser/ui/views/sad_tab_view.h'],
                 ['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/native_tab_contents_view_gtk.cc'],
+                ['include', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.h'],
+                ['include', '^browser/ui/views/tab_contents/native_tab_contents_view.h'],
+                ['include', '^browser/ui/views/tab_contents/native_tab_contents_view_delegate.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_view_gtk.cc'],
-                ['include', '^browser/ui/views/tab_contents/tab_contents_view_gtk.h'],
+                ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.cc'],
+                ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.h'],
                 ['include', '^browser/ui/views/tab_icon_view.cc'],
                 ['include', '^browser/ui/views/tab_icon_view.h'],
                 ['include', '^browser/ui/views/tabs/abstract_tab_strip_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.cc'],
                 ['include', '^browser/ui/views/tabs/browser_tab_strip.h'],
                 ['include', '^browser/ui/views/tabs/browser_tab_strip_controller.cc'],
@@ skipping 116 matching lines @@
                 ['include', '^browser/ui/views/tab_contents/tab_contents_view_touch.h'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.h'],
                 # TODO(anicolao): exclude these once we have WebUI dialogs
                 # ['exclude', '^browser/ui/gtk/constrained_window_gtk.cc'],
                 # ['exclude', '^browser/ui/gtk/constrained_window_gtk.h'],
                 ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
                 ['exclude', '^browser/ui/views/tabs/tab_strip_factory.cc'],
                 ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_native.cc'],
                 ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_native.h'],
-                ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.cc'],
-                ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.h'],
               ],
             }],
             ['OS=="linux" and chromeos==1',{
               'sources/': [
                 ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.cc'],
                 ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.h'],
                 ['include', '^browser/ui/login/login_prompt_ui.cc'],
                 ['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'],
                 ['include', '^browser/ui/views/omnibox/omnibox_view_views.h'],
                 ['exclude', '^browser/extensions/extension_tts_api_linux.cc'],
@@ skipping 256 matching lines @@
       'hard_dependency': 1,
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: