STASH: Epic Experimental patch for toolkit-views App List 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 1c1f2a522bd8983756e311f19a90dc7717335abb..a8fa26ea5e982884b9c2051fa9454b873c57606f 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1923,6 +1923,7 @@
       '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_views_delegate.cc',
       'browser/ui/views/chrome_views_delegate_chromeos.cc',
       'browser/ui/views/chrome_web_dialog_view.cc',
       'browser/ui/views/collected_cookies_views.cc',
@@ -2175,8 +2176,6 @@
       'browser/ui/views/profiles/supervised_user_avatar_label.h',
       'browser/ui/views/profiles/user_manager_view.cc',
       'browser/ui/views/profiles/user_manager_view.h',
-      'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
-      'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
       'browser/ui/views/sad_tab_view.cc',
       'browser/ui/views/sad_tab_view.h',
       'browser/ui/views/session_crashed_bubble_view.cc',
@@ -2203,8 +2202,6 @@
       'browser/ui/views/stubs_aura.cc',
       'browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc',
       'browser/ui/views/sync/profile_signin_confirmation_dialog_views.h',
-      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
-      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
       'browser/ui/views/tab_icon_view.cc',
       'browser/ui/views/tab_icon_view.h',
       'browser/ui/views/tab_modal_confirm_dialog_views.cc',
@@ -2284,6 +2281,11 @@
       'browser/ui/views/chrome_browser_main_extra_parts_views.h',
       'browser/ui/views/chrome_views_delegate.cc',
       'browser/ui/views/chrome_views_delegate.h',
+      'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
+      'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
+      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
+      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
+      'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.mm',
     ],
     # Views files for everwhere but ChromeOS.
     'chrome_browser_ui_views_non_chromeos_sources': [
@@ -2662,6 +2664,13 @@
         }],
         ['enable_task_manager==1', {
           'sources': [ '<@(chrome_browser_ui_task_manager_sources)' ],
+          'conditions': [
+            ['toolkit_views==0', {
+              'sources!': [
+                'browser/ui/views/task_manager_view.cc',
+              ]
+            }],
+          ],
         }],
         ['disable_nacl==0', {
           'sources': [ '<@(chrome_browser_ui_nacl_sources)' ],
@@ -2834,8 +2843,6 @@
             'browser/ui/tabs/tab_resources.h',
             'browser/ui/views/extensions/extension_view_views.cc',
             'browser/ui/views/extensions/extension_view_views.h',
-            # Task manager has its own sources list. Leave out the views one.
-            'browser/ui/views/task_manager_view.cc',
           ],
           'dependencies': [
             '../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code',