[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..04ed25a58a87a1278b138abf2520caf7baf259cc 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1951,6 +1951,19 @@
     ],
     # Cross-platform views sources also ready for toolkit-views on Mac.
     'chrome_browser_ui_views_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_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',
+      'browser/ui/views/extensions/extension_keybinding_registry_views.cc',

[tapted, 2015/06/04 04:48:00]

I don't think this will work. Cocoa's BrowserWindowController only initializes a
ExtensionKeybindingRegistryCocoa. I think NativeAppWindowViews will need to be
refactored to target their abstract base class instead (i.e.
ExtensionsKeybindingRegistry). 

I think extension_keybinding_registry_views.cc will only funciton correctly with
a toolkit-views browser (i.e. it should stay in the mac_views_browser build
only)

[jackhou1, 2015/06/04 06:06:40]

extension_keybinding_registry_views.cc doesn't seem to depend on much from the
toolkit-views browser. I figured it would be better to use that and make it work
since we'd get to exercise some code that'll be in the mac-views browser. I
don't know much about how the views keybinding registry works, but it seems
possible to have both implementations.

I'm not sure if refactoring ChromeNativeAppWindowViews to use
ExtensionKeybindingRegistryCocoa is straightforward either. With
NativeAppWindowCocoa, events come in via ChromeEventProcessingWindow which calls
NativeAppWindowCocoa::HandledByExtensionCommand, which directly calls
ExtensionKeybindingRegistryCocoa::ProcessKeyEvent.

[tapted, 2015/06/05 02:09:08]

Hm - yeah I think it will be OK. A "registry" sounds a bit like a singleton, but
that doesn't seem to be the case.

Another concern might be that ExtensionKeybindingRegistryCocoa::ProcessKeyEvent
emits, e.g.,  extensions::NOTIFICATION_EXTENSION_COMMAND_PAGE_ACTION_MAC but the
views one does not. However, I'm pretty sure that code path doesn't matter for
packaged apps either way. i.e. only keybindings on the browser window should be
invoking browser actions.

So this lg - I don't think anything will break, but there might be some test
cases to try out.

+      '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',

[tapted, 2015/06/04 04:48:00]

sort into the ui/views stuff below

[jackhou1, 2015/06/04 06:06:40]

Done.

+
+

[tapted, 2015/06/04 04:48:00]

nit: no blank lines

[jackhou1, 2015/06/04 06:06:40]

Done.

       'browser/ui/app_list/app_list_controller_delegate_views.cc',
       'browser/ui/app_list/app_list_controller_delegate_views.h',
       'browser/ui/app_list/app_list_service_views.cc',
@@ -2123,8 +2136,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 +2200,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 +2427,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',

[tapted, 2015/06/04 04:48:00]

ah! it already exists. So I think we just move this file into the build, have it
support Cocoa windows, delete this entire gyp section, and finally delete
chrome_app_window_client_cocoa.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 +2905,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 +2916,6 @@
             }],
             ['OS!="mac"', {
               'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ],
-              'dependencies': [
-                '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
-              ],
             }],
           ],
         }],
@@ -2987,9 +2988,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)' ],
             }],