MacViews: Initial chrome_browser_ui.gypi support for views on mac

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 c6072e8ed4e61c8714b2a29a02911bcff4255cf0..38fc7de8ea7b7d74e33eeb20ee464aa6d4cf37ce 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1822,8 +1822,10 @@
       'browser/ui/views/sync/one_click_signin_bubble_view.cc',
       'browser/ui/views/sync/one_click_signin_bubble_view.h',
     ],
-    'chrome_browser_ui_task_manager_sources': [
+    'chrome_browser_ui_task_manager_non_mac_sources': [

[Andre, 2014/07/18 20:08:57]

I think TaskManagerView is now ready for MacViews.
Can we make task_manager_view.cc part of chrome_browser_ui_views_sources?
(conditional on enable_task_manager=1)
We may need to add ifdef to avoid duplicate ShowTaskManager.

       'browser/ui/views/task_manager_view.cc',
+    ],
+    'chrome_browser_ui_task_manager_sources': [
       'browser/ui/cocoa/task_manager_mac.h',
       'browser/ui/cocoa/task_manager_mac.mm',

[Andre, 2014/07/18 20:08:57]

These 2 files are also part of chrome_browser_ui_non_ios_sources.
Delete them from there?
That may break the TaskManagerMac code in AppControllerMac if
enable_task_manager is 0. We can change that code to call
chrome::OpenTaskManager instead.

[tapted, 2014/07/23 03:20:31]

I'll think up some way to consolidate these.. For 3 files, task manager sure
does appear a lot. The gn build rules have much neater filtering - I might be
able to mimic that.

[tapted, 2014/07/29 08:04:10]

Done (task_manager_mac.* effectively appeared double, so we can just drop one).

     ],
@@ -1839,17 +1841,9 @@
       'browser/ui/webui/policy_ui.cc',
       'browser/ui/webui/policy_ui.h',
     ],
-    # Cross-platform views sources. We assume app list is enabled.
-    'chrome_browser_ui_views_sources': [
-      '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',
-      'browser/ui/app_list/app_list_service_views.h',
-      'browser/ui/app_list/app_list_shower_views.cc',
-      'browser/ui/app_list/app_list_shower_views.h',
+    # Cross-platform (except Mac) views sources. We assume app list is enabled.
+    'chrome_browser_ui_views_non_mac_sources': [
       'browser/ui/views/accelerator_utils_aura.cc',
-      'browser/ui/views/accessibility/accessibility_event_router_views.cc',
-      'browser/ui/views/accessibility/accessibility_event_router_views.h',
       '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',
@@ -1924,11 +1918,8 @@
       '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_browser_main_extra_parts_views.cc',
-      'browser/ui/views/chrome_browser_main_extra_parts_views.h',
       'browser/ui/views/chrome_views_delegate.cc',
       'browser/ui/views/chrome_views_delegate_chromeos.cc',
-      'browser/ui/views/chrome_views_delegate.h',
       'browser/ui/views/chrome_web_dialog_view.cc',
       'browser/ui/views/collected_cookies_views.cc',
       'browser/ui/views/collected_cookies_views.h',
@@ -2274,6 +2265,21 @@
       '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': [
+      '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',
+      'browser/ui/app_list/app_list_service_views.h',
+      'browser/ui/app_list/app_list_shower_views.cc',
+      'browser/ui/app_list/app_list_shower_views.h',
+      'browser/ui/views/accessibility/accessibility_event_router_views.cc',
+      'browser/ui/views/accessibility/accessibility_event_router_views.h',
+      'browser/ui/views/chrome_browser_main_extra_parts_views.cc',
+      'browser/ui/views/chrome_browser_main_extra_parts_views.h',
+      'browser/ui/views/chrome_views_delegate.cc',
+      'browser/ui/views/chrome_views_delegate.h',
+    ],
     # Views files for everwhere but ChromeOS.
     'chrome_browser_ui_views_non_chromeos_sources': [
       'browser/ui/views/chrome_views_delegate_aura.cc',
@@ -2640,8 +2646,11 @@
         ['enable_one_click_signin==1', {
           'sources': [ '<@(chrome_browser_ui_one_click_signin_sources)' ]
         }],
+        ['enable_task_manager==1 and OS!="mac"', {
+          'sources': [ '<@(chrome_browser_ui_task_manager_non_mac_sources)' ],
+        }],
         ['enable_task_manager==1', {
-          'sources': [ '<@(chrome_browser_ui_task_manager_sources)' ],
+          'sources': [ '<@(chrome_browser_ui_task_manager_sources' ],

[Andre, 2014/07/18 20:08:57]

Accidentally deleted the closing parenthesis?

[tapted, 2014/07/23 03:20:31]

Done - good catch (shakes fist@ gyp). It's possible the gyp-parser didn't even
notice this :/

         }],
         ['disable_nacl==0', {
           'sources': [ '<@(chrome_browser_ui_nacl_sources)' ],
@@ -2711,12 +2720,15 @@
         ['toolkit_views==1', {
           'sources': [ '<@(chrome_browser_ui_views_sources)' ],
           'conditions': [
-            ['chromeos == 0', {
+            ['chromeos == 0 and OS!="mac"', {
               '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)' ],
+            }],
           ],
         }],
         ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {
@@ -2832,6 +2844,9 @@
           ],
         }, {  # non-Mac.
           'sources': [ '<@(chrome_browser_ui_non_mac_sources)' ],
+          'sources/': [
+            ['exclude', '^browser/ui/cocoa/'],
+          ],
         }],
         ['OS=="win"', {
           'include_dirs': [
@@ -2862,7 +2877,7 @@
           ],
         }, {  # 'OS!="win"
           'conditions': [
-            ['use_aura==1', {
+            ['toolkit_views==1', {
               'dependencies': [
                 '../ui/views/controls/webview/webview.gyp:webview',
                 '../ui/views/views.gyp:views',
@@ -2871,10 +2886,7 @@
                 '<(INTERMEDIATE_DIR)',
                 '<(INTERMEDIATE_DIR)/chrome',
               ],
-              'sources/': [
-                ['exclude', '^browser/ui/cocoa/*'],
-              ],
-            }, { # else: use_aura==0
+            }, { # else: toolkit_views==0
               'sources/': [
                 # Exclude all of views.
                 ['exclude', '^browser/ui/views/'],