Stash: hacks to get MacViews chrome browser window working

chrome/chrome_browser_ui.gypi

 # Copyright 2012 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.
 
 {
   'variables': {
     'chrome_browser_ui_non_ios_sources': [
       'browser/ui/accelerator_utils.h',
       'browser/ui/android/android_about_app_info.cc',
       'browser/ui/android/android_about_app_info.h',
@@ skipping 1839 matching lines @@
       'browser/ui/hung_plugin_tab_helper.h',
       'browser/ui/webui/flash_ui.cc',
       'browser/ui/webui/flash_ui.h',
     ],
     'chrome_browser_ui_policy_sources': [
       'browser/ui/webui/policy_ui.cc',
       'browser/ui/webui/policy_ui.h',
     ],
     # Cross-platform (except Mac) views sources. We assume app list is enabled.
     'chrome_browser_ui_views_non_mac_sources': [
+      'browser/ui/views/frame/taskbar_decorator.cc',
       'browser/ui/views/accelerator_utils_aura.cc',
       'browser/ui/views/accessibility/invert_bubble_view.cc',
       'browser/ui/views/accessibility/invert_bubble_view.h',
-      'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc',
-      'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h',
-      'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc',
-      'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h',
-      'browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc',
-      'browser/ui/views/apps/app_info_dialog/app_info_header_panel.h',
-      'browser/ui/views/apps/app_info_dialog/app_info_panel.cc',
-      'browser/ui/views/apps/app_info_dialog/app_info_panel.h',
-      'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc',
-      'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h',
-      'browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc',
-      'browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h',
-      'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc',
-      'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h',
-      'browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc',
-      'browser/ui/views/apps/app_window_desktop_window_tree_host_win.h',
-      'browser/ui/views/apps/chrome_apps_client_views_win.cc',
-      'browser/ui/views/apps/chrome_native_app_window_views.cc',
-      'browser/ui/views/apps/chrome_native_app_window_views.h',
-      'browser/ui/views/apps/chrome_native_app_window_views_win.cc',
-      'browser/ui/views/apps/chrome_native_app_window_views_win.h',
-      'browser/ui/views/apps/desktop_keyboard_capture.cc',
-      'browser/ui/views/apps/desktop_keyboard_capture.h', 
-      'browser/ui/views/apps/glass_app_window_frame_view_win.cc',
-      'browser/ui/views/apps/glass_app_window_frame_view_win.h',
-      'browser/ui/views/apps/keyboard_hook_handler.h',
-      'browser/ui/views/apps/keyboard_hook_handler_win.cc',
-      'browser/ui/views/apps/shaped_app_window_targeter.cc',
-      'browser/ui/views/apps/shaped_app_window_targeter.h',
-      'browser/ui/views/ash/tab_scrubber.cc',
-      'browser/ui/views/ash/tab_scrubber.h',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_header_panel.h',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_panel.cc',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_panel.h',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc',
+      # 'browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h',
+      # 'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc',
+      # 'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h',
+      # 'browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc',
+      # 'browser/ui/views/apps/app_window_desktop_window_tree_host_win.h',
+      # 'browser/ui/views/apps/chrome_apps_client_views_win.cc',
+      # 'browser/ui/views/apps/chrome_native_app_window_views.cc',
+      # 'browser/ui/views/apps/chrome_native_app_window_views.h',
+      # 'browser/ui/views/apps/chrome_native_app_window_views_win.cc',
+      # 'browser/ui/views/apps/chrome_native_app_window_views_win.h',
+      # 'browser/ui/views/apps/desktop_keyboard_capture.cc',
+      # 'browser/ui/views/apps/desktop_keyboard_capture.h',
+      # 'browser/ui/views/apps/glass_app_window_frame_view_win.cc',
+      # 'browser/ui/views/apps/glass_app_window_frame_view_win.h',
+      # 'browser/ui/views/apps/keyboard_hook_handler.h',
+      # 'browser/ui/views/apps/keyboard_hook_handler_win.cc',
+      # 'browser/ui/views/apps/shaped_app_window_targeter.cc',
+      # 'browser/ui/views/apps/shaped_app_window_targeter.h',
+      # 'browser/ui/views/ash/tab_scrubber.cc',
+      # 'browser/ui/views/ash/tab_scrubber.h',
       'browser/ui/views/autofill/autofill_dialog_views.cc',
       'browser/ui/views/autofill/autofill_dialog_views.h',
       'browser/ui/views/autofill/autofill_popup_base_view.cc',
       'browser/ui/views/autofill/autofill_popup_base_view.h',
       'browser/ui/views/autofill/autofill_popup_view_views.cc',
       'browser/ui/views/autofill/autofill_popup_view_views.h',
       'browser/ui/views/autofill/decorated_textfield.cc',
       'browser/ui/views/autofill/decorated_textfield.h',
       'browser/ui/views/autofill/expanding_textfield.cc',
       'browser/ui/views/autofill/expanding_textfield.h',
@@ skipping 26 matching lines @@
       'browser/ui/views/bookmarks/bookmark_menu_controller_observer.h',
       'browser/ui/views/bookmarks/bookmark_menu_controller_views.cc',
       'browser/ui/views/bookmarks/bookmark_menu_controller_views.h',
       'browser/ui/views/bookmarks/bookmark_menu_delegate.cc',
       'browser/ui/views/bookmarks/bookmark_menu_delegate.h',
       'browser/ui/views/bookmarks/bookmark_sync_promo_view.cc',
       'browser/ui/views/bookmarks/bookmark_sync_promo_view.h',
       'browser/ui/views/certificate_viewer_win.cc',
       'browser/ui/views/chrome_javascript_native_dialog_factory_views.cc',
       'browser/ui/views/chrome_views_delegate_chromeos.cc',
-      'browser/ui/views/chrome_web_dialog_view.cc',
+      # 'browser/ui/views/chrome_web_dialog_view.cc',
       'browser/ui/views/collected_cookies_views.cc',
       'browser/ui/views/collected_cookies_views.h',
       'browser/ui/views/color_chooser_aura.cc',
       'browser/ui/views/color_chooser_aura.h',
       'browser/ui/views/color_chooser_win.cc',
       'browser/ui/views/confirm_bubble_views.cc',
       'browser/ui/views/confirm_bubble_views.h',
       'browser/ui/views/conflicting_module_view_win.cc',
       'browser/ui/views/conflicting_module_view_win.h',
       'browser/ui/views/constrained_web_dialog_delegate_views.cc',
       'browser/ui/views/content_setting_bubble_contents.cc',
       'browser/ui/views/content_setting_bubble_contents.h',
       'browser/ui/views/cookie_info_view.cc',
       'browser/ui/views/cookie_info_view.h',
       'browser/ui/views/create_application_shortcut_view.cc',
       'browser/ui/views/create_application_shortcut_view.h',
       'browser/ui/views/critical_notification_bubble_view.cc',
       'browser/ui/views/critical_notification_bubble_view.h',
-      'browser/ui/views/crypto_module_password_dialog_view.cc',
-      'browser/ui/views/crypto_module_password_dialog_view.h',
-      'browser/ui/views/desktop_media_picker_views.cc',
-      'browser/ui/views/desktop_media_picker_views.h',
+      # 'browser/ui/views/crypto_module_password_dialog_view.cc',
+      # 'browser/ui/views/crypto_module_password_dialog_view.h',
+      # 'browser/ui/views/desktop_media_picker_views.cc',
+      # 'browser/ui/views/desktop_media_picker_views.h',
       'browser/ui/views/detachable_toolbar_view.cc',
       'browser/ui/views/detachable_toolbar_view.h',
       'browser/ui/views/download/download_danger_prompt_views.cc',
       'browser/ui/views/download/download_feedback_dialog_view.cc',
       'browser/ui/views/download/download_feedback_dialog_view.h',
       'browser/ui/views/download/download_in_progress_dialog_view.cc',
       'browser/ui/views/download/download_in_progress_dialog_view.h',
       'browser/ui/views/download/download_item_view.cc',
       'browser/ui/views/download/download_item_view.h',
       'browser/ui/views/download/download_shelf_context_menu_view.cc',
@@ skipping 11 matching lines @@
       'browser/ui/views/edit_search_engine_dialog.h',
       'browser/ui/views/elevation_icon_setter.cc',
       'browser/ui/views/elevation_icon_setter.h',
       'browser/ui/views/extensions/bookmark_app_bubble_view.cc',
       'browser/ui/views/extensions/bookmark_app_bubble_view.h',
       'browser/ui/views/extensions/browser_action_drag_data.cc',
       'browser/ui/views/extensions/browser_action_drag_data.h',
       'browser/ui/views/extensions/bundle_installed_bubble.cc',
       'browser/ui/views/extensions/extension_action_platform_delegate_views.cc',
       'browser/ui/views/extensions/extension_action_platform_delegate_views.h',
-      'browser/ui/views/extensions/extension_dialog.cc',
-      'browser/ui/views/extensions/extension_dialog.h',
+      # 'browser/ui/views/extensions/extension_dialog.cc',
+      # 'browser/ui/views/extensions/extension_dialog.h',
       'browser/ui/views/extensions/extension_dialog_observer.cc',
       'browser/ui/views/extensions/extension_dialog_observer.h',
       'browser/ui/views/extensions/extension_install_dialog_view.cc',
-      'browser/ui/views/extensions/extension_installed_bubble_view.cc',
-      'browser/ui/views/extensions/extension_installed_bubble_view.h',
+      # 'browser/ui/views/extensions/extension_installed_bubble_view.cc',
+      # 'browser/ui/views/extensions/extension_installed_bubble_view.h',
       'browser/ui/views/extensions/extension_keybinding_registry_views.cc',
       'browser/ui/views/extensions/extension_keybinding_registry_views.h',
       'browser/ui/views/extensions/extension_message_bubble_view.cc',
       'browser/ui/views/extensions/extension_message_bubble_view.h',
-      'browser/ui/views/extensions/extension_popup.cc',
-      'browser/ui/views/extensions/extension_popup.h',
-      'browser/ui/views/extensions/extension_uninstall_dialog_view.cc',
+      # 'browser/ui/views/extensions/extension_popup.cc',
+      # 'browser/ui/views/extensions/extension_popup.h',
+      # 'browser/ui/views/extensions/extension_uninstall_dialog_view.cc',
       'browser/ui/views/extensions/extension_view_views.cc',
       'browser/ui/views/extensions/extension_view_views.h',
       'browser/ui/views/extensions/media_galleries_dialog_views.cc',
       'browser/ui/views/extensions/media_galleries_dialog_views.h',
       'browser/ui/views/extensions/media_gallery_checkbox_view.cc',
       'browser/ui/views/extensions/media_gallery_checkbox_view.h',
       'browser/ui/views/extensions/device_permissions_dialog_view.cc',
       'browser/ui/views/extensions/device_permissions_dialog_view.h',
       'browser/ui/views/first_run_bubble.cc',
       'browser/ui/views/first_run_bubble.h',
       'browser/ui/views/frame/browser_frame.cc',
       'browser/ui/views/frame/browser_frame.h',
       'browser/ui/views/frame/browser_frame_common_win.cc',
       'browser/ui/views/frame/browser_frame_common_win.h',
       'browser/ui/views/frame/browser_frame_mac.h',
       'browser/ui/views/frame/browser_frame_mac.mm',
+      'browser/ui/views/frame/browser_frame_view_mac.h',
+      'browser/ui/views/frame/browser_frame_view_mac.mm',
       'browser/ui/views/frame/browser_non_client_frame_view.cc',
       'browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc',
+      'browser/ui/views/frame/browser_non_client_frame_view_factory_mac.mm',
       'browser/ui/views/frame/browser_non_client_frame_view.h',
       'browser/ui/views/frame/browser_root_view.cc',
       'browser/ui/views/frame/browser_root_view.h',
       'browser/ui/views/frame/browser_shutdown.cc',
       'browser/ui/views/frame/browser_shutdown.h',
       'browser/ui/views/frame/browser_view.cc',
       'browser/ui/views/frame/browser_view.h',
       'browser/ui/views/frame/browser_view_layout.cc',
       'browser/ui/views/frame/browser_view_layout_delegate.h',
       'browser/ui/views/frame/browser_view_layout.h',
@@ skipping 34 matching lines @@
       'browser/ui/views/frame/taskbar_decorator_win.cc',
       'browser/ui/views/frame/top_container_view.cc',
       'browser/ui/views/frame/top_container_view.h',
       'browser/ui/views/frame/web_contents_close_handler.cc',
       'browser/ui/views/frame/web_contents_close_handler_delegate.h',
       'browser/ui/views/frame/web_contents_close_handler.h',
       'browser/ui/views/fullscreen_exit_bubble_views.cc',
       'browser/ui/views/fullscreen_exit_bubble_views.h',
       'browser/ui/views/global_error_bubble_view.cc',
       'browser/ui/views/global_error_bubble_view.h',
-      'browser/ui/views/hung_renderer_view.cc',
-      'browser/ui/views/hung_renderer_view.h',
+      # 'browser/ui/views/hung_renderer_view.cc',
+      # 'browser/ui/views/hung_renderer_view.h',
       'browser/ui/views/importer/import_lock_dialog_view.cc',
       'browser/ui/views/importer/import_lock_dialog_view.h',
       'browser/ui/views/infobars/alternate_nav_infobar_view.cc',
       'browser/ui/views/infobars/alternate_nav_infobar_view.h',
       'browser/ui/views/infobars/confirm_infobar.cc',
       'browser/ui/views/infobars/confirm_infobar.h',
       'browser/ui/views/infobars/extension_infobar.cc',
       'browser/ui/views/infobars/extension_infobar.h',
       'browser/ui/views/infobars/infobar_background.cc',
       'browser/ui/views/infobars/infobar_background.h',
@@ skipping 51 matching lines @@
       'browser/ui/views/omnibox/omnibox_popup_contents_view.cc',
       'browser/ui/views/omnibox/omnibox_popup_contents_view.h',
       'browser/ui/views/omnibox/omnibox_result_view.cc',
       'browser/ui/views/omnibox/omnibox_result_view.h',
       'browser/ui/views/omnibox/omnibox_view_views.cc',
       'browser/ui/views/omnibox/omnibox_view_views.h',
       'browser/ui/views/open_pdf_in_reader_bubble_view.cc',
       'browser/ui/views/open_pdf_in_reader_bubble_view.h',
       'browser/ui/views/outdated_upgrade_bubble_view.cc',
       'browser/ui/views/outdated_upgrade_bubble_view.h',
-      'browser/ui/views/panels/panel_frame_view.cc',
-      'browser/ui/views/panels/panel_frame_view.h',
-      'browser/ui/views/panels/panel_stack_view.cc',
-      'browser/ui/views/panels/panel_stack_view.h',
-      'browser/ui/views/panels/panel_view.cc',
-      'browser/ui/views/panels/panel_view.h',
-      'browser/ui/views/panels/taskbar_window_thumbnailer_win.cc',
-      'browser/ui/views/panels/taskbar_window_thumbnailer_win.h',
-      'browser/ui/views/panels/x11_panel_resizer.cc',
-      'browser/ui/views/panels/x11_panel_resizer.h',
+      # 'browser/ui/views/panels/panel_frame_view.cc',
+      # 'browser/ui/views/panels/panel_frame_view.h',
+      # 'browser/ui/views/panels/panel_stack_view.cc',
+      # 'browser/ui/views/panels/panel_stack_view.h',
+      # 'browser/ui/views/panels/panel_view.cc',
+      # 'browser/ui/views/panels/panel_view.h',
+      # 'browser/ui/views/panels/taskbar_window_thumbnailer_win.cc',
+      # 'browser/ui/views/panels/taskbar_window_thumbnailer_win.h',
+      # 'browser/ui/views/panels/x11_panel_resizer.cc',
+      # 'browser/ui/views/panels/x11_panel_resizer.h',
       'browser/ui/views/passwords/credentials_item_view.cc',
       'browser/ui/views/passwords/credentials_item_view.h',
       'browser/ui/views/passwords/manage_password_items_view.cc',
       'browser/ui/views/passwords/manage_password_items_view.h',
       'browser/ui/views/passwords/manage_passwords_bubble_view.cc',
       'browser/ui/views/passwords/manage_passwords_bubble_view.h',
       'browser/ui/views/passwords/manage_passwords_icon_view.cc',
       'browser/ui/views/passwords/manage_passwords_icon_view.h',
       'browser/ui/views/pdf_password_dialog.cc',
       'browser/ui/views/process_singleton_dialog_linux.cc',
       'browser/ui/views/profiles/avatar_menu_bubble_view.cc',
       'browser/ui/views/profiles/avatar_menu_bubble_view.h',
       'browser/ui/views/profiles/avatar_menu_button.cc',
       'browser/ui/views/profiles/avatar_menu_button.h',
       'browser/ui/views/profiles/new_avatar_button.cc',
       'browser/ui/views/profiles/new_avatar_button.h',
       'browser/ui/views/profiles/profile_chooser_view.cc',
       'browser/ui/views/profiles/profile_chooser_view.h',
       'browser/ui/views/profiles/profile_reset_bubble_view.cc',
       'browser/ui/views/profiles/profile_reset_bubble_view.h',
       'browser/ui/views/profiles/supervised_user_avatar_label.cc',
       'browser/ui/views/profiles/supervised_user_avatar_label.h',
       'browser/ui/views/profiles/user_manager_view.cc',
       'browser/ui/views/profiles/user_manager_view.h',
-      'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
-      'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
+      # 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
+      # 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
       'browser/ui/views/sad_tab_view.cc',
       'browser/ui/views/sad_tab_view.h',
       'browser/ui/views/session_crashed_bubble_view.cc',
       'browser/ui/views/session_crashed_bubble_view.h',
       'browser/ui/views/settings_api_bubble_helper_views.cc',
       'browser/ui/views/settings_api_bubble_helper_views.h',
       'browser/ui/views/signed_certificate_timestamp_info_view.cc',
       'browser/ui/views/signed_certificate_timestamp_info_view.h',
       'browser/ui/views/signed_certificate_timestamps_views.cc',
       'browser/ui/views/signed_certificate_timestamps_views.h',
       'browser/ui/views/simple_message_box_views.cc',
       'browser/ui/views/ssl_client_certificate_selector.cc',
       'browser/ui/views/ssl_client_certificate_selector.h',
       'browser/ui/views/status_bubble_views.cc',
       '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_linux.cc',
       'browser/ui/views/status_icons/status_tray_linux.h',
       'browser/ui/views/status_icons/status_tray_state_changer_win.cc',
       'browser/ui/views/status_icons/status_tray_state_changer_win.h',
       'browser/ui/views/status_icons/status_tray_win.cc',
       'browser/ui/views/status_icons/status_tray_win.h',
       'browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc',
       'browser/ui/views/sync/profile_signin_confirmation_dialog_views.h',
-      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
-      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
+      # 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
+      # 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
       'browser/ui/views/tab_icon_view.cc',
       'browser/ui/views/tab_icon_view.h',
       'browser/ui/views/tab_modal_confirm_dialog_views.cc',
       'browser/ui/views/tab_modal_confirm_dialog_views.h',
       'browser/ui/views/theme_image_mapper.cc',
       'browser/ui/views/theme_image_mapper.h',
       'browser/ui/views/touch_uma/touch_uma.h',
       'browser/ui/views/translate/translate_bubble_view.cc',
       'browser/ui/views/translate/translate_bubble_view.h',
       'browser/ui/views/update_recommended_message_box.cc',
       'browser/ui/views/update_recommended_message_box.h',
       'browser/ui/views/validation_message_bubble_delegate.cc',
       'browser/ui/views/validation_message_bubble_delegate.h',
-      'browser/ui/views/validation_message_bubble_view.cc',
-      'browser/ui/views/web_contents_modal_dialog_manager_views.cc',
+      # 'browser/ui/views/validation_message_bubble_view.cc',
+      # 'browser/ui/views/web_contents_modal_dialog_manager_views.cc',
       'browser/ui/views/website_settings/permissions_bubble_view.cc',
       'browser/ui/views/website_settings/permissions_bubble_view.h',
       'browser/ui/views/website_settings/permission_selector_view.cc',
       'browser/ui/views/website_settings/permission_selector_view.h',
       'browser/ui/views/website_settings/permission_selector_view_observer.h',
       'browser/ui/views/website_settings/website_settings_popup_view.cc',
       'browser/ui/views/website_settings/website_settings_popup_view.h',
     ],
     # Cross-platform views sources also ready for toolkit-views on Mac.
     'chrome_browser_ui_views_sources': [
@@ skipping 268 matching lines @@
       'browser/ui/views/athena/athena_util.cc',
       'browser/ui/views/athena/athena_util.h',
       'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc',
       'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h',
     ],
     # Counts desktop Linux and ChromeOS.
     'chrome_browser_ui_linux_sources': [
       'browser/ui/startup/autolaunch_prompt.cc',
       'browser/ui/views/apps/chrome_apps_client_views.cc',
       'browser/ui/views/apps/keyboard_hook_handler.cc',
-      'browser/ui/views/frame/taskbar_decorator.cc',
       'browser/ui/webui/certificate_viewer_ui.cc',
       'browser/ui/webui/certificate_viewer_ui.h',
       'browser/ui/webui/certificate_viewer_webui.cc',
       'browser/ui/webui/certificate_viewer_webui.h',
     ],
     # Desktop Linux. Assume aura/ash/views/x11.
     'chrome_browser_ui_desktop_linux_sources': [
       'browser/ui/views/app_list/linux/app_list_linux.cc',
       'browser/ui/views/app_list/linux/app_list_linux.h',
       'browser/ui/views/app_list/linux/app_list_service_linux.cc',
@@ skipping 271 matching lines @@
           'conditions': [
             ['OS!="android"', {
               'sources': [ '<@(chrome_browser_ui_non_athena_non_android_sources)' ],
             }],
             ['use_ash==1', {
               'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ],
             }],
           ],
         }],
         ['toolkit_views==1', {
-          'sources': [ '<@(chrome_browser_ui_views_sources)' ],
+          'sources': [ '<@(chrome_browser_ui_views_sources)', '<@(chrome_browser_ui_views_non_mac_sources)' ],
           'dependencies': [
             '<(DEPTH)/components/components.gyp:constrained_window',
           ],
           'conditions': [
             ['chromeos == 0 and OS!="mac"', {
               'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
             }],
             ['use_ash == 1', {
               'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ],
             }],
@@ skipping 74 matching lines @@
              'chrome_browser_ui_views.gyp:browser_ui_views',
           ],
           'sources': [ '<@(chrome_browser_ui_android_sources)' ],
         }, {  # Non-Android
           'sources': [ '<@(chrome_browser_ui_non_android_sources)' ],
         }],
         ['OS=="mac"', {
           'sources': [ '<@(chrome_browser_ui_mac_sources)' ],
           'sources!': [
             # Mac has its own way of drawing tabs.
-            'browser/ui/tabs/tab_resources.cc',
-            'browser/ui/tabs/tab_resources.h',
+            # 'browser/ui/tabs/tab_resources.cc',
+            # 'browser/ui/tabs/tab_resources.h',
             'browser/ui/views/extensions/extension_view_views.cc',
             'browser/ui/views/extensions/extension_view_views.h',
             # Task manager has its own sources list. Leave out the views one.
             'browser/ui/views/task_manager_view.cc',
           ],
           'dependencies': [
             '../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code',
             '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
             '../third_party/molokocacao/molokocacao.gyp:molokocacao',
             '../third_party/mozilla/mozilla.gyp:mozilla',
@@ skipping 174 matching lines @@
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
           ],
           'sources': [ '<@(chrome_browser_ui_non_mobile_sources)' ],
         }],
       ],
     },
   ],
 }