MacViews: Get chrome/browser/ui/views/frame to compile

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 aa0f24d32e656d4c91071239ed097c6650babf54..db2c7fdbfb18d56a3f20e3576c83293e138147c9 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -302,7 +302,7 @@
       'browser/ui/cocoa/browser_window_layout.mm',
       'browser/ui/cocoa/browser_window_controller_private.h',
       'browser/ui/cocoa/browser_window_controller_private.mm',
-      'browser/ui/cocoa/browser_window_factory.mm',
+      'browser/ui/cocoa/browser_window_factory_cocoa.mm',
       'browser/ui/cocoa/browser_window_utils.h',
       'browser/ui/cocoa/browser_window_utils.mm',
       'browser/ui/cocoa/bubble_combobox.h',
@@ -2001,9 +2001,11 @@
       '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_mac.h',

[tapted, 2014/11/05 05:00:47]

nit: sort after frame_common

[Andre, 2014/11/05 20:55:23]

Done.

+      'browser/ui/views/frame/browser_frame_mac.mm',
       'browser/ui/views/frame/browser_frame_common_win.cc',
       'browser/ui/views/frame/browser_frame_common_win.h',
-      'browser/ui/views/frame/browser_frame.h',
       '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.h',
@@ -2016,6 +2018,7 @@
       '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',
+      'browser/ui/views/frame/browser_window_factory.cc',
       'browser/ui/views/frame/browser_window_property_manager_win.cc',
       'browser/ui/views/frame/browser_window_property_manager_win.h',
       'browser/ui/views/frame/contents_layout_manager.cc',
@@ -2023,7 +2026,8 @@
       'browser/ui/views/frame/contents_web_view.cc',
       'browser/ui/views/frame/contents_web_view.h',
       'browser/ui/views/frame/immersive_mode_controller.cc',
-      'browser/ui/views/frame/immersive_mode_controller_factory.cc',
+      'browser/ui/views/frame/immersive_mode_controller_factory_ash.cc',
+      'browser/ui/views/frame/immersive_mode_controller_factory_mac.cc',
       'browser/ui/views/frame/immersive_mode_controller.h',
       'browser/ui/views/frame/immersive_mode_controller_stub.cc',
       'browser/ui/views/frame/immersive_mode_controller_stub.h',
@@ -2032,6 +2036,7 @@
       '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_browser_frame.h',
       'browser/ui/views/frame/opaque_browser_frame_view_layout.cc',
       'browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h',
@@ -2793,7 +2798,15 @@
             ['use_ash == 1', {
               'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ],
             }],
-            ['OS!="mac"', {
+            ['OS=="mac"', {
+              'conditions': [
+                ['mac_views_browser==1', {
+                  'sources!': [ 'browser/ui/cocoa/browser_window_factory_cocoa.mm', ],
+                }, {
+                  'sources!': [ 'browser/ui/views/frame/browser_window_factory.cc', ],              
+                }],
+              ],
+            }, {

[tapted, 2014/11/05 05:00:47]

you'll need to replicate this bit in gn - I think we're trying to keep them in
sync even though there's no gn bot for mac yet

[Andre, 2014/11/05 20:55:23]

Done.

               'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ],
               'dependencies': [
                 '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',