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

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 92426c0dc87e8584b50edfef5b93138819c95dfe..58eb09fec395716e85c7cecb34801ef545a7a7ec 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -760,7 +760,7 @@
       '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',
@@ -1969,18 +1969,28 @@
       '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': [
@@ -2123,8 +2133,6 @@
       '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',
@@ -2189,8 +2197,6 @@
       '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',
@@ -2418,13 +2424,7 @@
     # 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': [
@@ -2902,6 +2902,7 @@
           '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)', {
@@ -2912,9 +2913,6 @@
             }],
             ['OS!="mac"', {
               'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ],
-              'dependencies': [
-                '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
-              ],
             }],
           ],
         }],
@@ -2987,9 +2985,6 @@
                 '<@(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)' ],
             }],