[Mac] Include MacViews native app windows in regular builds.

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': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 742 matching lines @@
       'browser/ui/cocoa/applescript/constants_applescript.h',
       'browser/ui/cocoa/applescript/constants_applescript.mm',
       'browser/ui/cocoa/applescript/element_applescript.h',
       'browser/ui/cocoa/applescript/element_applescript.mm',
       'browser/ui/cocoa/applescript/error_applescript.h',
       'browser/ui/cocoa/applescript/error_applescript.mm',
       'browser/ui/cocoa/applescript/tab_applescript.h',
       'browser/ui/cocoa/applescript/tab_applescript.mm',
       'browser/ui/cocoa/applescript/window_applescript.h',
       'browser/ui/cocoa/applescript/window_applescript.mm',
-      'browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm',
+      'browser/ui/cocoa/apps/chrome_app_window_client_views_cocoa.mm',
       'browser/ui/cocoa/apps/native_app_window_cocoa.h',
       'browser/ui/cocoa/apps/native_app_window_cocoa.mm',
       'browser/ui/cocoa/autofill/autofill_account_chooser.h',
       'browser/ui/cocoa/autofill/autofill_account_chooser.mm',
       'browser/ui/cocoa/autofill/autofill_bubble_controller.h',
       'browser/ui/cocoa/autofill/autofill_bubble_controller.mm',
       'browser/ui/cocoa/autofill/autofill_details_container.h',
       'browser/ui/cocoa/autofill/autofill_details_container.mm',
       'browser/ui/cocoa/autofill/autofill_dialog_cocoa.h',
       'browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm',
@@ skipping 1188 matching lines @@
       '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_native_widget_mac.h',
+      'browser/ui/views/apps/app_window_native_widget_mac.mm',
       '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_mac.h',
+      'browser/ui/views/apps/chrome_native_app_window_views_mac.mm',
       'browser/ui/views/apps/desktop_keyboard_capture.cc',
       'browser/ui/views/apps/desktop_keyboard_capture.h',
       'browser/ui/views/apps/keyboard_hook_handler.cc',
       'browser/ui/views/apps/keyboard_hook_handler.h',
+      'browser/ui/views/apps/native_app_window_frame_view_mac.h',
+      'browser/ui/views/apps/native_app_window_frame_view_mac.mm',
       'browser/ui/views/chrome_browser_main_extra_parts_views.cc',
       'browser/ui/views/chrome_browser_main_extra_parts_views.h',
       'browser/ui/views/chrome_constrained_window_views_client.cc',
       'browser/ui/views/chrome_constrained_window_views_client.h',
       'browser/ui/views/chrome_views_delegate.cc',
       'browser/ui/views/chrome_views_delegate.h',
+      'browser/ui/views/extensions/extension_keybinding_registry_views.cc',
+      'browser/ui/views/extensions/extension_keybinding_registry_views.h',
+      'browser/ui/views/frame/native_widget_mac_frameless_nswindow.h',
+      'browser/ui/views/frame/native_widget_mac_frameless_nswindow.mm',
     ],
     # Views files for everywhere but ChromeOS.
     'chrome_browser_ui_views_non_chromeos_sources': [
       'browser/ui/views/external_protocol_dialog.cc',
       'browser/ui/views/external_protocol_dialog.h',
       'browser/ui/views/screen_capture_notification_ui_views.cc',
       'browser/ui/views/sync/one_click_signin_bubble_view.cc',
       'browser/ui/views/sync/one_click_signin_bubble_view.h',
     ],
     # Cross-platform (except Mac) views sources. We assume app list is enabled.
@@ skipping 122 matching lines @@
       'browser/ui/views/extensions/device_permissions_dialog_view.h',
       '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_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_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_popup_aura.cc',
       'browser/ui/views/extensions/extension_popup_aura.h',
       'browser/ui/views/extensions/extension_toolbar_icon_surfacing_bubble_views.cc',
       'browser/ui/views/extensions/extension_toolbar_icon_surfacing_bubble_views.h',
       'browser/ui/views/extensions/extension_uninstall_dialog_view.cc',
       'browser/ui/views/extensions/extension_view_views.cc',
@@ skipping 44 matching lines @@
       'browser/ui/views/frame/immersive_mode_controller_factory_mac.cc',
       'browser/ui/views/frame/immersive_mode_controller_stub.cc',
       'browser/ui/views/frame/immersive_mode_controller_stub.h',
       'browser/ui/views/frame/minimize_button_metrics_win.cc',
       'browser/ui/views/frame/minimize_button_metrics_win.h',
       'browser/ui/views/frame/native_browser_frame.h',
       'browser/ui/views/frame/native_browser_frame_factory.cc',
       'browser/ui/views/frame/native_browser_frame_factory.h',
       'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc',
       'browser/ui/views/frame/native_browser_frame_factory_mac.cc',
-      'browser/ui/views/frame/native_widget_mac_frameless_nswindow.h',
-      'browser/ui/views/frame/native_widget_mac_frameless_nswindow.mm',
       'browser/ui/views/frame/opaque_browser_frame_view.cc',
       'browser/ui/views/frame/opaque_browser_frame_view.h',
       'browser/ui/views/frame/opaque_browser_frame_view_layout.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_layout.h',
       'browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h',
       'browser/ui/views/frame/opaque_browser_frame_view_linux.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_linux.h',
       'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h',
       'browser/ui/views/frame/system_menu_insertion_delegate_win.cc',
@@ skipping 207 matching lines @@
       'browser/ui/views/website_settings/permission_selector_view_observer.h',
       'browser/ui/views/website_settings/permissions_bubble_view.cc',
       'browser/ui/views/website_settings/permissions_bubble_view.h',
       'browser/ui/views/website_settings/website_settings_popup_view.cc',
       'browser/ui/views/website_settings/website_settings_popup_view.h',
     ],
     # MacViews sources that we still want to keep behind a compile-time flag.
     # TODO(jackhou): Move items to chrome_browser_ui_views_sources when they
     # migrate from mac_views_browser to a chrome://flag.
     'chrome_browser_ui_views_mac_experimental_sources': [
-      'browser/ui/views/apps/app_window_native_widget_mac.h',
-      'browser/ui/views/apps/app_window_native_widget_mac.mm',
       'browser/ui/views/apps/chrome_app_window_client_views_mac.mm',
-      'browser/ui/views/apps/chrome_native_app_window_views_mac.h',
-      'browser/ui/views/apps/chrome_native_app_window_views_mac.mm',
-      'browser/ui/views/apps/native_app_window_frame_view_mac.h',
-      'browser/ui/views/apps/native_app_window_frame_view_mac.mm',
     ],
     # Windows-only. Assume ash/aura/views.
     'chrome_browser_ui_win_sources': [
       'browser/ui/network_profile_bubble.cc',
       'browser/ui/network_profile_bubble.h',
       'browser/ui/views/color_chooser_dialog.cc',
       'browser/ui/views/color_chooser_dialog.h',
       'browser/ui/views/frame/browser_desktop_window_tree_host.h',
       'browser/ui/views/frame/browser_desktop_window_tree_host_win.cc',
       'browser/ui/views/frame/browser_desktop_window_tree_host_win.h',
@@ skipping 457 matching lines @@
               'sources': [ '<@(chrome_browser_ui_ash_non_chromeos)' ],
             }],
           ],
         }, { # use_ash==0
           'sources': [ '<@(chrome_browser_ui_non_ash_sources)' ],
         }],
         ['toolkit_views==1', {
           'sources': [ '<@(chrome_browser_ui_views_sources)' ],
           'dependencies': [
             '<(DEPTH)/components/components.gyp:constrained_window',
+            '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
           ],
           'conditions': [
             ['chromeos == 0 and (OS!="mac" or mac_views_browser==1)', {
               'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
             }],
             ['use_ash == 1', {
               'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ],
             }],
             ['OS!="mac"', {
               'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ],
-              'dependencies': [
-                '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
-              ],
             }],
           ],
         }],
         ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {
           'dependencies': [
             # gtk2 is the only component that can interact with gtk2 in our new
             # world.
             'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',
             '../build/linux/system.gyp:gio',
           ],
@@ skipping 52 matching lines @@
             '../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',
           ],
           'conditions': [
             ['mac_views_browser==1', {
               'sources': [
                 '<@(chrome_browser_ui_views_mac_experimental_sources)',
                 '<@(chrome_browser_ui_views_non_mac_sources)',
               ],
-              'dependencies': [
-                '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
-              ],
             }, {
               'sources': [ '<@(chrome_browser_ui_cocoa_sources)' ],
             }],
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Quartz.framework',
             ],
           },
           'actions': [
@@ skipping 191 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }